database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge and pre push fix for test of bug#37719

Browse Source
This commit is contained in:
Mattias Jonsson
2008-11-05 22:26:39 +01:00
parent 8a544f2a73 a470fd7ba4
commit f8588915ca
4 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/suite/parts/inc/partition_mgm.inc
View File

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

77
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
View File

@ -170,26 +170,30 @@ SHOW TABLES;
Tables_in_MySQL_Test_DB Tables_in_MySQL_Test_DB
TableA TableA
tablea tablea
RENAME TABLE TableA to tableA;
SELECT * FROM tablea; SELECT * FROM tablea;
a a
1 1
1
10 10
2
7
8
9
SELECT * FROM tableA;
a
1
10 10
11 11
12 12
2 2
2
3 3
4 4
5 5
6 6
7 7
7
8
8 8
9 9
9 RENAME TABLE tableA to TableA;
SHOW CREATE TABLE tablea; SHOW CREATE TABLE tablea;
Table Create Table Table Create Table
tablea CREATE TABLE `tablea` ( tablea CREATE TABLE `tablea` (
@ -206,7 +210,6 @@ ALTER TABLE TableA REMOVE PARTITIONING;
SELECT * FROM TableA; SELECT * FROM TableA;
a a
1 1
1
10 10
11 11
12 12
@ -216,10 +219,7 @@ a
5 5
6 6
7 7
7
8 8
8
9
9 9
SHOW CREATE TABLE TableA; SHOW CREATE TABLE TableA;
Table Create Table Table Create Table
@ -406,26 +406,30 @@ SHOW TABLES;
Tables_in_MySQL_Test_DB Tables_in_MySQL_Test_DB
TableA TableA
tablea tablea
RENAME TABLE TableA to tableA;
SELECT * FROM tablea; SELECT * FROM tablea;
a a
1 1
1
10 10
2
7
8
9
SELECT * FROM tableA;
a
1
10 10
11 11
12 12
2 2
2
3 3
4 4
5 5
6 6
7 7
7
8
8 8
9 9
9 RENAME TABLE tableA to TableA;
SHOW CREATE TABLE tablea; SHOW CREATE TABLE tablea;
Table Create Table Table Create Table
tablea CREATE TABLE `tablea` ( tablea CREATE TABLE `tablea` (
@ -442,21 +446,16 @@ ALTER TABLE TableA REMOVE PARTITIONING;
SELECT * FROM TableA; SELECT * FROM TableA;
a a
1 1
1
10
10 10
11 11
12 12
2 2
2
3 3
4 4
5 5
6 6
7 7
8 8
8
9
9 9
SHOW CREATE TABLE TableA; SHOW CREATE TABLE TableA;
Table Create Table Table Create Table
@ -638,26 +637,30 @@ SHOW TABLES;
Tables_in_MySQL_Test_DB Tables_in_MySQL_Test_DB
TableA TableA
tablea tablea
RENAME TABLE TableA to tableA;
SELECT * FROM tablea; SELECT * FROM tablea;
a a
1 1
1
10 10
2
7
8
9
SELECT * FROM tableA;
a
1
10 10
11 11
12 12
2 2
2
3 3
4 4
5 5
6 6
7 7
7
8
8 8
9 9
9 RENAME TABLE tableA to TableA;
SHOW CREATE TABLE tablea; SHOW CREATE TABLE tablea;
Table Create Table Table Create Table
tablea CREATE TABLE `tablea` ( tablea CREATE TABLE `tablea` (
@ -674,22 +677,16 @@ ALTER TABLE TableA REMOVE PARTITIONING;
SELECT * FROM TableA; SELECT * FROM TableA;
a a
1 1
1
10
10 10
11 11
12 12
2 2
2
3 3
4 4
5 5
6 6
7 7
7
8 8
8
9
9 9
SHOW CREATE TABLE TableA; SHOW CREATE TABLE TableA;
Table Create Table Table Create Table
@ -866,23 +863,27 @@ SHOW TABLES;
Tables_in_MySQL_Test_DB Tables_in_MySQL_Test_DB
TableA TableA
tablea tablea
RENAME TABLE TableA to tableA;
SELECT * FROM tablea; SELECT * FROM tablea;
a a
1 1
1
10 10
12
2 2
7
8
9
SELECT * FROM tableA;
a
1
12
3 3
4 4
5 5
6 6
7 7
7
8
8 8
9 9
9 RENAME TABLE tableA to TableA;
SHOW CREATE TABLE tablea; SHOW CREATE TABLE tablea;
Table Create Table Table Create Table
tablea CREATE TABLE `tablea` ( tablea CREATE TABLE `tablea` (
@ -899,19 +900,13 @@ ALTER TABLE TableA REMOVE PARTITIONING;
SELECT * FROM TableA; SELECT * FROM TableA;
a a
1 1
1
10
12 12
2
3 3
4 4
5 5
6 6
7 7
7
8 8
8
9
9 9
SHOW CREATE TABLE TableA; SHOW CREATE TABLE TableA;
Table Create Table Table Create Table

1
mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
View File

@ -31,7 +31,6 @@
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Engine specific settings and requirements # Engine specific settings and requirements
let $have_bug37719= 1;
##### Storage engine to be tested ##### Storage engine to be tested
--source include/have_archive.inc --source include/have_archive.inc

2
storage/archive/ha_archive.cc
View File

@ -171,7 +171,7 @@ int archive_db_init(void *p)
if (pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST)) if (pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST))
goto error; 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)) (hash_get_key) archive_get_key, 0, 0))
{ {
VOID(pthread_mutex_destroy(&archive_mutex)); VOID(pthread_mutex_destroy(&archive_mutex));