commit aefa71dfa58406b966e0217b729f17a7a988bf28

Author: Yahoo\! <ltucker@yahoo-inc.com>
Date:   Mon Aug 24 10:29:29 2009 -0700

    Fix an merge issue caused by MAPREDUCE-832 by applying this patch:
    http://issues.apache.org/jira/secure/attachment/12417453/mapreduce-834-ydist.patch


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1076986 13f79535-47bb-0310-9956-ffa450edef68

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -3169,8 +3169,8 @@ public class TaskTracker
           		"It shouldn't be greater than task limits");
           totalMemoryAllottedForTasks = JobConf.DISABLED_MEMORY_LIMIT;
         } else {
-          totalMemoryAllottedForTasks = (maxCurrentMapTasks + 
-              maxCurrentReduceTasks) *  (memoryAllotedForSlot/(1024 * 1024));
+          totalMemoryAllottedForTasks = (maxMapSlots + 
+              maxReduceSlots) *  (memoryAllotedForSlot/(1024 * 1024));
         }
       }
     }