bk commit into 6.0 tree (istruewing:1.2668) BUG#26379

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
6.0 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-15 21:19:05+01:00, istruewing@stripped +2 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Post-merge fix

  sql/sql_select.cc@stripped, 2007-11-15 21:19:03+01:00, istruewing@stripped +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Post-merge fix

  sql/sql_show.cc@stripped, 2007-11-15 21:19:03+01:00, istruewing@stripped +2 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Post-merge fix

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-11-15 20:28:02 +01:00
+++ b/sql/sql_select.cc	2007-11-15 21:19:03 +01:00
@@ -12182,7 +12182,7 @@ TABLE *create_duplicate_weedout_tmp_tabl
   table->keys_in_use_for_query.init();
 
   table->s= share;
-  init_tmp_table_share(share, "", 0, tmpname, tmpname);
+  init_tmp_table_share(thd, share, "", 0, tmpname, tmpname);
   share->blob_field= blob_field;
   share->blob_ptr_size= mi_portable_sizeof_char_ptr;
   share->db_low_byte_first=1;                // True for HEAP and MyISAM
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-11-05 19:17:38 +01:00
+++ b/sql/sql_show.cc	2007-11-15 21:19:03 +01:00
@@ -4061,7 +4061,7 @@ bool store_schema_params(THD *thd, TABLE
 
   bzero((char*) &tbl, sizeof(TABLE));
   (void) build_table_filename(path, sizeof(path), "", "", "", 0);
-  init_tmp_table_share(&share, "", 0, "", path);
+  init_tmp_table_share(thd, &share, "", 0, "", path);
 
   get_field(thd->mem_root, proc_table->field[MYSQL_PROC_FIELD_DB], &sp_db);
   get_field(thd->mem_root, proc_table->field[MYSQL_PROC_FIELD_NAME], &sp_name);
@@ -4242,7 +4242,7 @@ bool store_schema_proc(THD *thd, TABLE *
 
           bzero((char*) &tbl, sizeof(TABLE));
           (void) build_table_filename(path, sizeof(path), "", "", "", 0);
-          init_tmp_table_share(&share, "", 0, "", path);
+          init_tmp_table_share(thd, &share, "", 0, "", path);
           field= make_field(&share, (uchar*) 0, field_def->length,
                             (uchar*) "", 0, field_def->pack_flag,
                             field_def->sql_type, field_def->charset,