Vadim Tkachenko
17 years ago
19 changed files with 408 additions and 245 deletions
-
7mysql-test/innodb-index.result
-
10mysql-test/innodb-index.test
-
1mysql-test/innodb_bug34300.test
-
3mysql-test/innodb_bug36169.result
-
7mysql-test/innodb_bug36169.test
-
7mysql-test/innodb_bug36172.test
-
3mysql-test/innodb_xtradb_bug317074.result
-
7mysql-test/innodb_xtradb_bug317074.test
-
10mysql-test/patches/bug32625.diff
-
87mysql-test/patches/bug41893.diff
-
30mysql-test/patches/events_stress.diff
-
135mysql-test/patches/information_schema.diff
-
21mysql-test/patches/information_schema_db.diff
-
16mysql-test/patches/innodb-analyze.diff
-
102mysql-test/patches/innodb-index.diff
-
36mysql-test/patches/innodb.diff
-
70mysql-test/patches/mysqlbinlog_row_big.diff
-
40mysql-test/patches/mysqlshow.diff
-
61mysql-test/patches/variables-big.diff
@ -1,2 +1,5 @@ |
|||
set @old_innodb_file_per_table=@@innodb_file_per_table; |
|||
set @old_innodb_file_format=@@innodb_file_format; |
|||
set @old_innodb_file_format_check=@@innodb_file_format_check; |
|||
SET GLOBAL innodb_file_format='Barracuda'; |
|||
SET GLOBAL innodb_file_per_table=ON; |
|||
@ -1,2 +1,5 @@ |
|||
set @old_innodb_file_per_table=@@innodb_file_per_table; |
|||
set @old_innodb_file_format=@@innodb_file_format; |
|||
set @old_innodb_file_format_check=@@innodb_file_format_check; |
|||
SET GLOBAL innodb_file_format='Barracuda'; |
|||
SET GLOBAL innodb_file_per_table=ON; |
|||
@ -1,10 +0,0 @@ |
|||
--- 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; |
|||
@ -1,87 +0,0 @@ |
|||
=== modified file 'mysql-test/r/variables.result'
|
|||
--- mysql-test/r/variables.result 2008-11-27 10:50:28 +0000
|
|||
+++ mysql-test/r/variables.result 2009-01-06 07:33:27 +0000
|
|||
@@ -297,14 +297,14 @@
|
|||
select ROUND(RAND(),5); |
|||
ROUND(RAND(),5) |
|||
0.02887 |
|||
-show variables like '%alloc%';
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
Variable_name Value |
|||
query_alloc_block_size 8192 |
|||
query_prealloc_size 8192 |
|||
range_alloc_block_size 4096 |
|||
transaction_alloc_block_size 8192 |
|||
transaction_prealloc_size 4096 |
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
QUERY_ALLOC_BLOCK_SIZE 8192 |
|||
QUERY_PREALLOC_SIZE 8192 |
|||
@@ -319,14 +319,14 @@
|
|||
select @@query_alloc_block_size; |
|||
@@query_alloc_block_size |
|||
17408 |
|||
-show variables like '%alloc%';
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
Variable_name Value |
|||
query_alloc_block_size 17408 |
|||
query_prealloc_size 18432 |
|||
range_alloc_block_size 16384 |
|||
transaction_alloc_block_size 19456 |
|||
transaction_prealloc_size 20480 |
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
QUERY_ALLOC_BLOCK_SIZE 17408 |
|||
QUERY_PREALLOC_SIZE 18432 |
|||
@@ -336,14 +336,14 @@
|
|||
set @@range_alloc_block_size=default; |
|||
set @@query_alloc_block_size=default, @@query_prealloc_size=default; |
|||
set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; |
|||
-show variables like '%alloc%';
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
Variable_name Value |
|||
query_alloc_block_size 8192 |
|||
query_prealloc_size 8192 |
|||
range_alloc_block_size 4096 |
|||
transaction_alloc_block_size 8192 |
|||
transaction_prealloc_size 4096 |
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
QUERY_ALLOC_BLOCK_SIZE 8192 |
|||
QUERY_PREALLOC_SIZE 8192 |
|||
|
|||
=== modified file 'mysql-test/t/variables.test'
|
|||
--- mysql-test/t/variables.test 2008-11-27 10:50:28 +0000
|
|||
+++ mysql-test/t/variables.test 2009-01-06 07:28:12 +0000
|
|||
@@ -172,21 +172,21 @@
|
|||
set @@rand_seed1=10000000,@@rand_seed2=1000000; |
|||
select ROUND(RAND(),5); |
|||
|
|||
-show variables like '%alloc%';
|
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
set @@range_alloc_block_size=1024*16; |
|||
set @@query_alloc_block_size=1024*17+2; |
|||
set @@query_prealloc_size=1024*18; |
|||
set @@transaction_alloc_block_size=1024*20-1; |
|||
set @@transaction_prealloc_size=1024*21-1; |
|||
select @@query_alloc_block_size; |
|||
-show variables like '%alloc%';
|
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
set @@range_alloc_block_size=default; |
|||
set @@query_alloc_block_size=default, @@query_prealloc_size=default; |
|||
set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; |
|||
-show variables like '%alloc%';
|
|||
-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
|
|||
+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
|
|||
+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
|
|||
|
|||
# |
|||
# Bug #10904 Illegal mix of collations between |
|||
|
|||
@ -0,0 +1,30 @@ |
|||
--- mysql-test/t/events_stress.test.orig 2009-04-16 19:39:47.000000000 +0000
|
|||
+++ mysql-test/t/events_stress.test 2009-04-16 19:41:16.000000000 +0000
|
|||
@@ -61,6 +61,7 @@
|
|||
} |
|||
--enable_query_log |
|||
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2'; |
|||
+SET @old_event_scheduler=@@event_scheduler;
|
|||
SET GLOBAL event_scheduler=on; |
|||
--sleep 2.5 |
|||
DROP DATABASE events_conn1_test2; |
|||
@@ -135,3 +136,4 @@
|
|||
# |
|||
|
|||
DROP DATABASE events_test; |
|||
+SET GLOBAL event_scheduler=@old_event_scheduler;
|
|||
--- mysql-test/r/events_stress.result.orig 2009-04-16 19:41:48.000000000 +0000
|
|||
+++ mysql-test/r/events_stress.result 2009-04-16 19:42:07.000000000 +0000
|
|||
@@ -32,6 +32,7 @@
|
|||
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2'; |
|||
COUNT(*) |
|||
50 |
|||
+SET @old_event_scheduler=@@event_scheduler;
|
|||
SET GLOBAL event_scheduler=on; |
|||
DROP DATABASE events_conn1_test2; |
|||
SET GLOBAL event_scheduler=off; |
|||
@@ -63,3 +64,4 @@
|
|||
DROP TABLE fill_it2; |
|||
DROP TABLE fill_it3; |
|||
DROP DATABASE events_test; |
|||
+SET GLOBAL event_scheduler=@old_event_scheduler;
|
|||
@ -0,0 +1,21 @@ |
|||
--- mysql-test/r/information_schema_db.result.orig 2009-04-16 20:05:49.000000000 +0000
|
|||
+++ mysql-test/r/information_schema_db.result 2009-04-16 20:06:07.000000000 +0000
|
|||
@@ -33,6 +33,18 @@
|
|||
TRIGGERS |
|||
USER_PRIVILEGES |
|||
VIEWS |
|||
+INNODB_BUFFER_POOL_PAGES_INDEX
|
|||
+INNODB_RSEG
|
|||
+INNODB_LOCKS
|
|||
+INNODB_BUFFER_POOL_PAGES
|
|||
+XTRADB_ENHANCEMENTS
|
|||
+INNODB_TRX
|
|||
+INNODB_BUFFER_POOL_PAGES_BLOB
|
|||
+INNODB_LOCK_WAITS
|
|||
+INNODB_CMP_RESET
|
|||
+INNODB_CMP
|
|||
+INNODB_CMPMEM_RESET
|
|||
+INNODB_CMPMEM
|
|||
show tables from INFORMATION_SCHEMA like 'T%'; |
|||
Tables_in_information_schema (T%) |
|||
TABLES |
|||
@ -0,0 +1,16 @@ |
|||
--- mysql-test/t/innodb-analyze.test.orig 2009-04-16 22:08:00.000000000 +0000
|
|||
+++ mysql-test/t/innodb-analyze.test 2009-04-16 22:09:08.000000000 +0000
|
|||
@@ -10,7 +10,7 @@
|
|||
-- disable_query_log |
|||
-- disable_result_log |
|||
-- enable_warnings |
|||
-
|
|||
+SET @old_innodb_stats_sample_pages=@@innodb_stats_sample_pages;
|
|||
SET GLOBAL innodb_stats_sample_pages=0; |
|||
|
|||
# check that the value has been adjusted to 1 |
|||
@@ -61,3 +61,4 @@
|
|||
ANALYZE TABLE innodb_analyze; |
|||
|
|||
DROP TABLE innodb_analyze; |
|||
+SET GLOBAL innodb_stats_sample_pages=@old_innodb_stats_sample_pages;
|
|||
@ -1,62 +1,42 @@ |
|||
This part of the innodb-index test causes mysqld to print some warnings |
|||
and subsequently the whole mysql-test suite to fail. |
|||
|
|||
A permanent solution is probably to remove the printouts from the source |
|||
code or to somehow tell the mysql-test suite that warnings are expected. |
|||
Currently we simply do not execute the problematic tests. Please |
|||
coordinate a permanent solution with Marko, who added those tests. |
|||
|
|||
This cannot be proposed to MySQL because it touches files that are not |
|||
in the MySQL source repository. |
|||
|
|||
Index: storage/innobase/mysql-test/innodb-index.result
|
|||
===================================================================
|
|||
--- storage/innobase/mysql-test/innodb-index.result (revision 2870)
|
|||
+++ storage/innobase/mysql-test/innodb-index.result (working copy)
|
|||
@@ -43,19 +43,12 @@ t1 CREATE TABLE `t1` (
|
|||
`b` int(11) DEFAULT NULL, |
|||
`c` char(10) NOT NULL, |
|||
`d` varchar(20) DEFAULT NULL, |
|||
KEY `d2` (`d`), |
|||
KEY `b` (`b`) |
|||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 |
|||
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
|
|||
-alter table t1 add unique index (c), add index (d);
|
|||
-ERROR HY000: Table 'test.t1#1' already exists
|
|||
-rename table `t1#1` to `t1#2`;
|
|||
-alter table t1 add unique index (c), add index (d);
|
|||
-ERROR HY000: Table 'test.t1#2' already exists
|
|||
-drop table `t1#2`;
|
|||
alter table t1 add unique index (c), add index (d); |
|||
show create table t1; |
|||
Table Create Table |
|||
t1 CREATE TABLE `t1` ( |
|||
`a` int(11) NOT NULL, |
|||
`b` int(11) DEFAULT NULL, |
|||
Index: storage/innobase/mysql-test/innodb-index.test
|
|||
===================================================================
|
|||
--- storage/innobase/mysql-test/innodb-index.test (revision 2870)
|
|||
+++ storage/innobase/mysql-test/innodb-index.test (working copy)
|
|||
@@ -14,22 +14,12 @@ select * from t1 force index (d2) order
|
|||
--error ER_DUP_ENTRY |
|||
alter table t1 add unique index (b); |
|||
show create table t1; |
|||
alter table t1 add index (b); |
|||
show create table t1; |
|||
--- mysql-test/t/innodb-index.test.orig 2009-04-16 22:12:38.000000000 +0000
|
|||
+++ mysql-test/t/innodb-index.test 2009-04-16 22:16:58.000000000 +0000
|
|||
@@ -344,6 +344,11 @@
|
|||
|
|||
let $per_table=`select @@innodb_file_per_table`; |
|||
let $format=`select @@innodb_file_format`; |
|||
+
|
|||
+set @old_innodb_file_per_table=@@innodb_file_per_table;
|
|||
+set @old_innodb_file_format=@@innodb_file_format;
|
|||
+set @old_innodb_file_format_check=@@innodb_file_format_check;
|
|||
+
|
|||
set global innodb_file_per_table=on; |
|||
set global innodb_file_format='Barracuda'; |
|||
# Test creating a table that could lead to undo log overflow. |
|||
@@ -499,3 +504,8 @@
|
|||
|
|||
-# Check how existing tables interfere with temporary tables.
|
|||
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
|
|||
-
|
|||
---error 156
|
|||
-alter table t1 add unique index (c), add index (d);
|
|||
-rename table `t1#1` to `t1#2`;
|
|||
---error 156
|
|||
-alter table t1 add unique index (c), add index (d);
|
|||
-drop table `t1#2`;
|
|||
-
|
|||
alter table t1 add unique index (c), add index (d); |
|||
show create table t1; |
|||
explain select * from t1 force index(c) order by c; |
|||
alter table t1 add primary key (a), drop index c; |
|||
show create table t1; |
|||
--error ER_MULTIPLE_PRI_KEY |
|||
DROP TABLE t2; |
|||
DROP TABLE t1; |
|||
+
|
|||
+set global innodb_file_per_table=@old_innodb_file_per_table;
|
|||
+set global innodb_file_format=@old_innodb_file_format;
|
|||
+set global innodb_file_format_check=@old_innodb_file_format_check;
|
|||
+
|
|||
--- mysql-test/r/innodb-index.result.orig 2009-04-16 22:18:18.000000000 +0000
|
|||
+++ mysql-test/r/innodb-index.result 2009-04-16 22:18:47.000000000 +0000
|
|||
@@ -877,6 +877,9 @@
|
|||
44 |
|||
commit; |
|||
drop table t1; |
|||
+set @old_innodb_file_per_table=@@innodb_file_per_table;
|
|||
+set @old_innodb_file_format=@@innodb_file_format;
|
|||
+set @old_innodb_file_format_check=@@innodb_file_format_check;
|
|||
set global innodb_file_per_table=on; |
|||
set global innodb_file_format='Barracuda'; |
|||
create table t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob,h blob, |
|||
@@ -1125,3 +1128,6 @@
|
|||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 |
|||
DROP TABLE t2; |
|||
DROP TABLE t1; |
|||
+set global innodb_file_per_table=@old_innodb_file_per_table;
|
|||
+set global innodb_file_format=@old_innodb_file_format;
|
|||
+set global innodb_file_format_check=@old_innodb_file_format_check;
|
|||
@ -0,0 +1,36 @@ |
|||
--- mysql-test/t/innodb.test.orig 2009-04-16 16:15:05.000000000 +0000
|
|||
+++ mysql-test/t/innodb.test 2009-04-16 16:15:54.000000000 +0000
|
|||
@@ -1318,6 +1318,7 @@
|
|||
show variables like "innodb_sync_spin_loops"; |
|||
|
|||
# Test for innodb_thread_concurrency variable |
|||
+set @old_innodb_thread_concurrency=@@innodb_thread_concurrency;
|
|||
show variables like "innodb_thread_concurrency"; |
|||
set global innodb_thread_concurrency=1001; |
|||
show variables like "innodb_thread_concurrency"; |
|||
@@ -1325,6 +1326,7 @@
|
|||
show variables like "innodb_thread_concurrency"; |
|||
set global innodb_thread_concurrency=16; |
|||
show variables like "innodb_thread_concurrency"; |
|||
+set global innodb_thread_concurrency=@old_innodb_thread_concurrency;
|
|||
|
|||
# Test for innodb_concurrency_tickets variable |
|||
show variables like "innodb_concurrency_tickets"; |
|||
--- mysql-test/r/innodb.result.orig 2009-04-16 16:16:11.000000000 +0000
|
|||
+++ mysql-test/r/innodb.result 2009-04-16 16:16:46.000000000 +0000
|
|||
@@ -1781,6 +1781,7 @@
|
|||
show variables like "innodb_sync_spin_loops"; |
|||
Variable_name Value |
|||
innodb_sync_spin_loops 20 |
|||
+set @old_innodb_thread_concurrency=@@innodb_thread_concurrency;
|
|||
show variables like "innodb_thread_concurrency"; |
|||
Variable_name Value |
|||
innodb_thread_concurrency 0 |
|||
@@ -1798,6 +1799,7 @@
|
|||
show variables like "innodb_thread_concurrency"; |
|||
Variable_name Value |
|||
innodb_thread_concurrency 16 |
|||
+set global innodb_thread_concurrency=@old_innodb_thread_concurrency;
|
|||
show variables like "innodb_concurrency_tickets"; |
|||
Variable_name Value |
|||
innodb_concurrency_tickets 500 |
|||
@ -0,0 +1,70 @@ |
|||
--- mysql-test/r/mysqlbinlog_row_big.result.orig 2009-04-17 18:58:20.000000000 +0900
|
|||
+++ mysql-test/r/mysqlbinlog_row_big.result 2009-04-17 18:56:48.000000000 +0900
|
|||
@@ -1,4 +1,9 @@
|
|||
# |
|||
+# We need big packets.
|
|||
+#
|
|||
+SET @old_global_max_allowed_packet=@@global.max_allowed_packet;
|
|||
+SET @@global.max_allowed_packet= 1024*1024*1024;
|
|||
+#
|
|||
# Preparatory cleanup. |
|||
# |
|||
DROP TABLE IF EXISTS t1; |
|||
@@ -7,10 +12,6 @@
|
|||
# |
|||
SET timestamp=1000000000; |
|||
# |
|||
-# We need big packets.
|
|||
-#
|
|||
-SET @@global.max_allowed_packet= 1024*1024*1024;
|
|||
-#
|
|||
# Delete all existing binary logs. |
|||
# |
|||
RESET MASTER; |
|||
@@ -71,4 +72,5 @@
|
|||
# Cleanup. |
|||
# |
|||
DROP TABLE t1; |
|||
+SET @@global.max_allowed_packet=@old_global_max_allowed_packet;
|
|||
remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out |
|||
--- mysql-test/t/mysqlbinlog_row_big.test.orig 2009-04-17 18:57:58.000000000 +0900
|
|||
+++ mysql-test/t/mysqlbinlog_row_big.test 2009-04-17 18:56:32.000000000 +0900
|
|||
@@ -24,6 +24,16 @@
|
|||
--source include/big_test.inc |
|||
|
|||
--echo # |
|||
+--echo # We need big packets.
|
|||
+--echo #
|
|||
+connect (con1, localhost, root,,);
|
|||
+connection con1;
|
|||
+SET @old_global_max_allowed_packet=@@global.max_allowed_packet;
|
|||
+SET @@global.max_allowed_packet= 1024*1024*1024;
|
|||
+connect (con2, localhost, root,,);
|
|||
+connection con2;
|
|||
+
|
|||
+--echo #
|
|||
--echo # Preparatory cleanup. |
|||
--echo # |
|||
--disable_warnings |
|||
@@ -36,11 +46,6 @@
|
|||
SET timestamp=1000000000; |
|||
|
|||
--echo # |
|||
---echo # We need big packets.
|
|||
---echo #
|
|||
-SET @@global.max_allowed_packet= 1024*1024*1024;
|
|||
-
|
|||
---echo #
|
|||
--echo # Delete all existing binary logs. |
|||
--echo # |
|||
RESET MASTER; |
|||
@@ -122,6 +127,9 @@
|
|||
--echo # |
|||
DROP TABLE t1; |
|||
|
|||
+connection con1;
|
|||
+SET @@global.max_allowed_packet=@old_global_max_allowed_packet;
|
|||
+
|
|||
--echo remove_file \$MYSQLTEST_VARDIR/$mysqlbinlog_output |
|||
# |
|||
# NOTE: If you want to see the *huge* mysqlbinlog output, disable next line: |
|||
@ -0,0 +1,40 @@ |
|||
--- mysql-test/r/mysqlshow.result.orig 2009-04-16 20:13:30.000000000 +0000
|
|||
+++ mysql-test/r/mysqlshow.result 2009-04-16 20:13:45.000000000 +0000
|
|||
@@ -107,6 +107,18 @@
|
|||
| TRIGGERS | |
|||
| USER_PRIVILEGES | |
|||
| VIEWS | |
|||
+| INNODB_BUFFER_POOL_PAGES_INDEX |
|
|||
+| INNODB_RSEG |
|
|||
+| INNODB_LOCKS |
|
|||
+| INNODB_BUFFER_POOL_PAGES |
|
|||
+| XTRADB_ENHANCEMENTS |
|
|||
+| INNODB_TRX |
|
|||
+| INNODB_BUFFER_POOL_PAGES_BLOB |
|
|||
+| INNODB_LOCK_WAITS |
|
|||
+| INNODB_CMP_RESET |
|
|||
+| INNODB_CMP |
|
|||
+| INNODB_CMPMEM_RESET |
|
|||
+| INNODB_CMPMEM |
|
|||
+---------------------------------------+ |
|||
Database: INFORMATION_SCHEMA |
|||
+---------------------------------------+ |
|||
@@ -140,6 +152,18 @@
|
|||
| TRIGGERS | |
|||
| USER_PRIVILEGES | |
|||
| VIEWS | |
|||
+| INNODB_BUFFER_POOL_PAGES_INDEX |
|
|||
+| INNODB_RSEG |
|
|||
+| INNODB_LOCKS |
|
|||
+| INNODB_BUFFER_POOL_PAGES |
|
|||
+| XTRADB_ENHANCEMENTS |
|
|||
+| INNODB_TRX |
|
|||
+| INNODB_BUFFER_POOL_PAGES_BLOB |
|
|||
+| INNODB_LOCK_WAITS |
|
|||
+| INNODB_CMP_RESET |
|
|||
+| INNODB_CMP |
|
|||
+| INNODB_CMPMEM_RESET |
|
|||
+| INNODB_CMPMEM |
|
|||
+---------------------------------------+ |
|||
Wildcard: inf_rmation_schema |
|||
+--------------------+ |
|||
@ -0,0 +1,61 @@ |
|||
--- mysql-test/r/variables-big.result.orig 2009-04-17 19:18:57.000000000 +0900
|
|||
+++ mysql-test/r/variables-big.result 2009-04-17 19:17:10.000000000 +0900
|
|||
@@ -1,20 +1,21 @@
|
|||
+set @pid_temp = (select ID from information_schema.processlist);
|
|||
set session transaction_prealloc_size=1024*1024*1024*1; |
|||
-show processlist;
|
|||
-Id User Host db Command Time State Info
|
|||
-1 root localhost test Query 0 NULL show processlist
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
+TRUE
|
|||
+1
|
|||
set session transaction_prealloc_size=1024*1024*1024*2; |
|||
-show processlist;
|
|||
-Id User Host db Command Time State Info
|
|||
-1 root localhost test Query 0 NULL show processlist
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
+TRUE
|
|||
+1
|
|||
set session transaction_prealloc_size=1024*1024*1024*3; |
|||
-show processlist;
|
|||
-Id User Host db Command Time State Info
|
|||
-1 root localhost test Query 0 NULL show processlist
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
+TRUE
|
|||
+1
|
|||
set session transaction_prealloc_size=1024*1024*1024*4; |
|||
-show processlist;
|
|||
-Id User Host db Command Time State Info
|
|||
-1 root localhost test Query 0 NULL show processlist
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
+TRUE
|
|||
+1
|
|||
set session transaction_prealloc_size=1024*1024*1024*5; |
|||
-show processlist;
|
|||
-Id User Host db Command Time State Info
|
|||
-1 root localhost test Query 0 NULL show processlist
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
+TRUE
|
|||
+1
|
|||
--- mysql-test/t/variables-big.test.orig 2009-04-17 19:18:12.000000000 +0900
|
|||
+++ mysql-test/t/variables-big.test 2009-04-17 19:16:26.000000000 +0900
|
|||
@@ -8,13 +8,14 @@
|
|||
# Bug #27322 failure to allocate transaction_prealloc_size causes crash |
|||
# |
|||
|
|||
+set @pid_temp = (select ID from information_schema.processlist);
|
|||
set session transaction_prealloc_size=1024*1024*1024*1; |
|||
-show processlist;
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
set session transaction_prealloc_size=1024*1024*1024*2; |
|||
-show processlist;
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
set session transaction_prealloc_size=1024*1024*1024*3; |
|||
-show processlist;
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
set session transaction_prealloc_size=1024*1024*1024*4; |
|||
-show processlist;
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
set session transaction_prealloc_size=1024*1024*1024*5; |
|||
-show processlist;
|
|||
+select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue