bzr commit into mysql-5.1 branch (mattias.jonsson:2697) Bug#37719

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/

 2697 Mattias Jonsson	2008-11-05 [merge]
      merge and pre push fix for test of bug#37719
modified:
  mysql-test/suite/parts/inc/partition_mgm.inc
  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
  storage/archive/ha_archive.cc

=== modified file 'mysql-test/suite/parts/inc/partition_mgm.inc'
--- a/mysql-test/suite/parts/inc/partition_mgm.inc	2008-07-10 23:14:13 +0000
+++ b/mysql-test/suite/parts/inc/partition_mgm.inc	2008-11-05 21:26:39 +0000
@@ -13,7 +13,6 @@
 #   part_optA-D   Extra partitioning options (E.g. INDEX/DATA DIR)             #
 #                                                                              #
 #   have_bug33158 NDB case insensitive create, but case sensitive rename       #
-#   have_bug37719 Archive, crash when rename and then select                   #
 #------------------------------------------------------------------------------#
 # Original Author: mattiasj                                                    #
 # Original Date: 2008-06-27                                                    #
@@ -125,18 +124,12 @@ PARTITION BY KEY (a)
  PARTITION PartD $part_optD);
 INSERT INTO tablea VALUES (1), (2), (7), (8), (9), (10);
 SHOW TABLES;
-if (!$have_bug37719)
-{
 RENAME TABLE TableA to tableA;
-}
 --sorted_result
 SELECT * FROM tablea;
-if (!$have_bug37719)
-{
 --sorted_result
 SELECT * FROM tableA;
 RENAME TABLE tableA to TableA;
-}
 SHOW CREATE TABLE tablea;
 DROP TABLE tablea;
 }
@@ -262,18 +255,12 @@ PARTITION BY HASH (a)
  PARTITION PartD $part_optD);
 INSERT INTO tablea VALUES (1), (2), (7), (8), (9), (10);
 SHOW TABLES;
-if (!$have_bug37719)
-{
 RENAME TABLE TableA to tableA;
-}
 --sorted_result
 SELECT * FROM tablea;
-if (!$have_bug37719)
-{
 --sorted_result
 SELECT * FROM tableA;
 RENAME TABLE tableA to TableA;
-}
 SHOW CREATE TABLE tablea;
 DROP TABLE tablea;
 }
@@ -388,18 +375,12 @@ PARTITION BY RANGE (a)
  PARTITION PartD VALUES LESS THAN (13) $part_optD);
 INSERT INTO tablea VALUES (1), (2), (7), (8), (9), (10);
 SHOW TABLES;
-if (!$have_bug37719)
-{
 RENAME TABLE TableA to tableA;
-}
 --sorted_result
 SELECT * FROM tablea;
-if (!$have_bug37719)
-{
 --sorted_result
 SELECT * FROM tableA;
 RENAME TABLE tableA to TableA;
-}
 SHOW CREATE TABLE tablea;
 DROP TABLE tablea;
 }
@@ -516,18 +497,12 @@ PARTITION BY LIST (a)
  PARTITION PartD VALUES IN (5,6,12) $part_optD);
 INSERT INTO tablea VALUES (1), (2), (7), (8), (9), (10);
 SHOW TABLES;
-if (!$have_bug37719)
-{
 RENAME TABLE TableA to tableA;
-}
 --sorted_result
 SELECT * FROM tablea;
-if (!$have_bug37719)
-{
 --sorted_result
 SELECT * FROM tableA;
 RENAME TABLE tableA to TableA;
-}
 SHOW CREATE TABLE tablea;
 DROP TABLE tablea;
 }

=== modified file 'mysql-test/suite/parts/r/partition_mgm_lc0_archive.result'
--- a/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result	2008-11-04 07:43:21 +0000
+++ b/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result	2008-11-05 21:26:39 +0000
@@ -170,26 +170,30 @@ SHOW TABLES;
 Tables_in_MySQL_Test_DB
 TableA
 tablea
+RENAME TABLE TableA to tableA;
 SELECT * FROM tablea;
 a
 1
-1
 10
+2
+7
+8
+9
+SELECT * FROM tableA;
+a
+1
 10
 11
 12
 2
-2
 3
 4
 5
 6
 7
-7
 8
-8
-9
 9
+RENAME TABLE tableA to TableA;
 SHOW CREATE TABLE tablea;
 Table	Create Table
 tablea	CREATE TABLE `tablea` (
@@ -206,7 +210,6 @@ ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
 a
 1
-1
 10
 11
 12
@@ -216,10 +219,7 @@ a
 5
 6
 7
-7
 8
-8
-9
 9
 SHOW CREATE TABLE TableA;
 Table	Create Table
@@ -406,26 +406,30 @@ SHOW TABLES;
 Tables_in_MySQL_Test_DB
 TableA
 tablea
+RENAME TABLE TableA to tableA;
 SELECT * FROM tablea;
 a
 1
-1
 10
+2
+7
+8
+9
+SELECT * FROM tableA;
+a
+1
 10
 11
 12
 2
-2
 3
 4
 5
 6
 7
-7
-8
 8
 9
-9
+RENAME TABLE tableA to TableA;
 SHOW CREATE TABLE tablea;
 Table	Create Table
 tablea	CREATE TABLE `tablea` (
@@ -442,21 +446,16 @@ ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
 a
 1
-1
-10
 10
 11
 12
 2
-2
 3
 4
 5
 6
 7
 8
-8
-9
 9
 SHOW CREATE TABLE TableA;
 Table	Create Table
@@ -638,26 +637,30 @@ SHOW TABLES;
 Tables_in_MySQL_Test_DB
 TableA
 tablea
+RENAME TABLE TableA to tableA;
 SELECT * FROM tablea;
 a
 1
-1
 10
+2
+7
+8
+9
+SELECT * FROM tableA;
+a
+1
 10
 11
 12
 2
-2
 3
 4
 5
 6
 7
-7
-8
 8
 9
-9
+RENAME TABLE tableA to TableA;
 SHOW CREATE TABLE tablea;
 Table	Create Table
 tablea	CREATE TABLE `tablea` (
@@ -674,23 +677,17 @@ ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
 a
 1
-1
-10
 10
 11
 12
 2
-2
 3
 4
 5
 6
 7
-7
-8
 8
 9
-9
 SHOW CREATE TABLE TableA;
 Table	Create Table
 TableA	CREATE TABLE `TableA` (
@@ -866,23 +863,27 @@ SHOW TABLES;
 Tables_in_MySQL_Test_DB
 TableA
 tablea
+RENAME TABLE TableA to tableA;
 SELECT * FROM tablea;
 a
 1
-1
 10
-12
 2
+7
+8
+9
+SELECT * FROM tableA;
+a
+1
+12
 3
 4
 5
 6
 7
-7
 8
-8
-9
 9
+RENAME TABLE tableA to TableA;
 SHOW CREATE TABLE tablea;
 Table	Create Table
 tablea	CREATE TABLE `tablea` (
@@ -899,19 +900,13 @@ ALTER TABLE TableA REMOVE PARTITIONING;
 SELECT * FROM TableA;
 a
 1
-1
-10
 12
-2
 3
 4
 5
 6
 7
-7
 8
-8
-9
 9
 SHOW CREATE TABLE TableA;
 Table	Create Table

=== modified file 'mysql-test/suite/parts/t/partition_mgm_lc0_archive.test'
--- a/mysql-test/suite/parts/t/partition_mgm_lc0_archive.test	2008-07-10 23:14:13 +0000
+++ b/mysql-test/suite/parts/t/partition_mgm_lc0_archive.test	2008-11-05 21:26:39 +0000
@@ -31,7 +31,6 @@
 
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
-let $have_bug37719= 1;
 
 ##### Storage engine to be tested
 --source include/have_archive.inc

=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2007-12-20 21:11:37 +0000
+++ b/storage/archive/ha_archive.cc	2008-10-03 18:08:40 +0000
@@ -171,7 +171,7 @@ int archive_db_init(void *p)
 
   if (pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST))
     goto error;
-  if (hash_init(&archive_open_tables, system_charset_info, 32, 0, 0,
+  if (hash_init(&archive_open_tables, table_alias_charset, 32, 0, 0,
                 (hash_get_key) archive_get_key, 0, 0))
   {
     VOID(pthread_mutex_destroy(&archive_mutex));