From d599a75d88c738f7855761bf3b0ec8603f3aa3ea Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 7 Oct 2008 08:06:17 +0000 Subject: [PATCH] branches/zip: Add some more patches to mysql-test. type_bit_innodb.diff: Ignore the reported duplicate value. The reported value depends on the internal workings of the merge sort in fast index creation. In the built-in InnoDB of MySQL 5.1, the records are copied to a new temporary table in the order they were selected from the original table. information_schema.diff: Account for the INFORMATION_SCHEMA tables that were added in the InnoDB plugin. innodb_file_per_table.diff: In the InnoDB plugin, innodb_file_per_table is a settable global variable. --- mysql-test/patches/information_schema.diff | 76 +++++++++++++++++++ mysql-test/patches/innodb_file_per_table.diff | 25 ++++++ mysql-test/patches/type_bit_innodb.diff | 10 +++ 3 files changed, 111 insertions(+) create mode 100644 mysql-test/patches/information_schema.diff create mode 100644 mysql-test/patches/innodb_file_per_table.diff create mode 100644 mysql-test/patches/type_bit_innodb.diff diff --git a/mysql-test/patches/information_schema.diff b/mysql-test/patches/information_schema.diff new file mode 100644 index 00000000000..1da424d73d2 --- /dev/null +++ b/mysql-test/patches/information_schema.diff @@ -0,0 +1,76 @@ +--- mysql-test/r/information_schema.result.orig 2008-08-04 09:27:49.000000000 +0300 ++++ mysql-test/r/information_schema.result 2008-10-07 11:21:51.000000000 +0300 +@@ -64,6 +64,13 @@ TABLE_PRIVILEGES + TRIGGERS + USER_PRIVILEGES + VIEWS ++INNODB_CMP_RESET ++INNODB_TRX ++INNODB_CMPMEM_RESET ++INNODB_LOCK_WAITS ++INNODB_CMPMEM ++INNODB_CMP ++INNODB_LOCKS + columns_priv + db + event +@@ -795,6 +802,8 @@ TABLES CREATE_TIME datetime + TABLES UPDATE_TIME datetime + TABLES CHECK_TIME datetime + TRIGGERS CREATED datetime ++INNODB_TRX trx_started datetime ++INNODB_TRX trx_wait_started datetime + event execute_at datetime + event last_executed datetime + event starts datetime +@@ -848,7 +857,7 @@ delete from mysql.db where user='mysqlte + flush privileges; + SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; + table_schema count(*) +-information_schema 28 ++information_schema 35 + mysql 22 + create table t1 (i int, j int); + create trigger trg1 before insert on t1 for each row +@@ -1263,6 +1272,13 @@ TABLE_PRIVILEGES TABLE_SCHEMA + TRIGGERS TRIGGER_SCHEMA + USER_PRIVILEGES GRANTEE + VIEWS TABLE_SCHEMA ++INNODB_CMP_RESET page_size ++INNODB_TRX trx_id ++INNODB_CMPMEM_RESET page_size ++INNODB_LOCK_WAITS requesting_trx_id ++INNODB_CMPMEM page_size ++INNODB_CMP page_size ++INNODB_LOCKS lock_id + SELECT t.table_name, c1.column_name + FROM information_schema.tables t + INNER JOIN +@@ -1306,6 +1322,13 @@ TABLE_PRIVILEGES TABLE_SCHEMA + TRIGGERS TRIGGER_SCHEMA + USER_PRIVILEGES GRANTEE + VIEWS TABLE_SCHEMA ++INNODB_CMP_RESET page_size ++INNODB_TRX trx_id ++INNODB_CMPMEM_RESET page_size ++INNODB_LOCK_WAITS requesting_trx_id ++INNODB_CMPMEM page_size ++INNODB_CMP page_size ++INNODB_LOCKS lock_id + SELECT MAX(table_name) FROM information_schema.tables; + MAX(table_name) + VIEWS +@@ -1382,6 +1405,13 @@ EVENTS information_schema.EVENTS 1 + FILES information_schema.FILES 1 + GLOBAL_STATUS information_schema.GLOBAL_STATUS 1 + GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1 ++INNODB_CMP information_schema.INNODB_CMP 1 ++INNODB_CMPMEM information_schema.INNODB_CMPMEM 1 ++INNODB_CMPMEM_RESET information_schema.INNODB_CMPMEM_RESET 1 ++INNODB_CMP_RESET information_schema.INNODB_CMP_RESET 1 ++INNODB_LOCKS information_schema.INNODB_LOCKS 1 ++INNODB_LOCK_WAITS information_schema.INNODB_LOCK_WAITS 1 ++INNODB_TRX information_schema.INNODB_TRX 1 + KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 + PARTITIONS information_schema.PARTITIONS 1 + PLUGINS information_schema.PLUGINS 1 diff --git a/mysql-test/patches/innodb_file_per_table.diff b/mysql-test/patches/innodb_file_per_table.diff new file mode 100644 index 00000000000..cdc50f92ebd --- /dev/null +++ b/mysql-test/patches/innodb_file_per_table.diff @@ -0,0 +1,25 @@ +--- mysql-test/t/innodb_file_per_table_basic.test.orig 2008-10-07 11:32:30.000000000 +0300 ++++ mysql-test/t/innodb_file_per_table_basic.test 2008-10-07 11:52:14.000000000 +0300 +@@ -37,10 +37,6 @@ + # Check if Value can set # + #################################################################### + +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SET @@GLOBAL.innodb_file_per_table=1; +---echo Expected error 'Read only variable' +- + SELECT COUNT(@@GLOBAL.innodb_file_per_table); + --echo 1 Expected + +--- mysql-test/r/innodb_file_per_table_basic.result.orig 2008-10-07 11:32:02.000000000 +0300 ++++ mysql-test/r/innodb_file_per_table_basic.result 2008-10-07 11:52:47.000000000 +0300 +@@ -4,9 +4,6 @@ + 1 + 1 Expected + '#---------------------BS_STVARS_028_02----------------------#' +-SET @@GLOBAL.innodb_file_per_table=1; +-ERROR HY000: Variable 'innodb_file_per_table' is a read only variable +-Expected error 'Read only variable' + SELECT COUNT(@@GLOBAL.innodb_file_per_table); + COUNT(@@GLOBAL.innodb_file_per_table) + 1 diff --git a/mysql-test/patches/type_bit_innodb.diff b/mysql-test/patches/type_bit_innodb.diff new file mode 100644 index 00000000000..dcedcb1fa79 --- /dev/null +++ b/mysql-test/patches/type_bit_innodb.diff @@ -0,0 +1,10 @@ +--- mysql-test/t/type_bit_innodb.test.orig 2008-10-07 11:32:32.000000000 +0300 ++++ mysql-test/t/type_bit_innodb.test 2008-10-07 11:56:40.000000000 +0300 +@@ -40,6 +40,7 @@ + create table t1 (a bit) engine=innodb; + insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001'); + select hex(a) from t1; ++--replace_regex /entry '(.*)' for/entry '' for/ + --error ER_DUP_ENTRY + alter table t1 add unique (a); + drop table t1;