bzr push into mysql-6.0-bugteam branch (joro:2946 to 2947)

[Georgi Kodinov]

 2947 Georgi Kodinov	2009-01-07
      fixing merge problems : 
       - disabled select_jcl6 and reported bug 41919
       - removed a bad merge and fixed a typo
modified:
  mysql-test/t/disabled.def
  sql/mysqld.cc

 2946 Georgi Kodinov	2009-01-06 [merge]
      merged 6.0-bugteam -> local tree
modified:
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
  sql/log.cc

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-01-06 10:38:47 +0000
+++ b/mysql-test/t/disabled.def	2009-01-07 11:16:31 +0000
@@ -23,3 +23,4 @@ log_output_basic                  : Bug 
 ;wait_timeout_func                 : Bug #41225 joro wait_timeout_func fails
 ;kill                              : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249                 : Bug#41098 Query Cache returns wrong result with concurrent insert
+select_jcl6                       : Bug#41919 select_jcl6 fails with valgrind errors

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-01-06 16:52:32 +0000
+++ b/sql/mysqld.cc	2009-01-07 11:16:31 +0000
@@ -264,13 +264,7 @@ void backup_shutdown();
 #if defined(__linux__)
 #define ENABLE_TEMP_POOL 1
 #else
-#define ENABLE_TEMP_TOOL 0
-#endif
-
-#if defined(__linux__)
-#define ENABLE_TEMP_POOL 1
-#else
-#define ENABLE_TEMP_TOOL 0
+#define ENABLE_TEMP_POOL 0
 #endif
 
 /* Constants */