bzr push into mysql-6.0-bugteam branch (vvaintroub:2779 to 2780) Bug#39750

[Vladislav Vaintroub]

 2780 Vladislav Vaintroub	2008-12-08 [merge]
      merge bug#39750 to 6.0-bugteam
modified:
  sql/mysqld.cc

 2779 Mattias Jonsson	2008-12-08 [merge]
      merge

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-12-05 01:05:05 +0000
+++ b/sql/mysqld.cc	2008-12-08 15:32:57 +0000
@@ -261,6 +261,12 @@ int backup_init();
 void backup_shutdown();
 #endif
 
+#if defined(__linux__)
+#define ENABLE_TEMP_POOL 1
+#else
+#define ENABLE_TEMP_TOOL 0
+#endif
+
 /* Constants */
 
 const char *show_comp_option_name[]= {"YES", "NO", "DISABLED"};
@@ -3636,8 +3642,13 @@ static int init_common_variables(const c
     return 1; /* purecov: tested */
 #endif /* defined(ENABLED_DEBUG_SYNC) */
 
+#if (ENABLE_TEMP_POOL)
   if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1))
     return 1;
+#else
+  use_temp_pool= 0;
+#endif
+
   if (my_database_names_init())
     return 1;
 
@@ -6648,9 +6659,14 @@ log and this option does nothing anymore
    0, GET_UINT, OPT_ARG, 0, 0, UINT_MAX, 0, 0, 0},
 #endif /* defined(ENABLED_DEBUG_SYNC) */
   {"temp-pool", OPT_TEMP_POOL,
+#if (ENABLE_TEMP_POOL)
    "Using this option will cause most temporary files created to use a small set of names, rather than a unique name for each new file.",
+#else
+   "This option is ignored on this OS.",
+#endif
    (uchar**) &use_temp_pool, (uchar**) &use_temp_pool, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
+
   {"timed_mutexes", OPT_TIMED_MUTEXES,
    "Specify whether to time mutexes (only InnoDB mutexes are currently supported)",
    (uchar**) &timed_mutexes, (uchar**) &timed_mutexes, 0, GET_BOOL, NO_ARG, 0,