mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Test suite fixes:
- Don't omit the @@debug variable from testcase check, since it can cause real problems. - Fix some bad merges by reverting to be identical to MySQL 5.1. mysql-test/include/mtr_check.sql: Don't omit the @@debug variable from testcase check, since it can cause real problems. mysql-test/r/mysqlbinlog_row_big.result: Fix incorrect merge. mysql-test/r/variables-big.result: Fix incorrect merge, by reverting to MySQL 5.1 version. mysql-test/t/mysqlbinlog_row_big.test: Fix incorrect merge. mysql-test/t/variables-big.test: Fix incorrect merge, by reverting to MySQL 5.1 version.
This commit is contained in:
parent
59f80387ba
commit
02c33646b3
5 changed files with 40 additions and 60 deletions
|
@ -12,7 +12,7 @@ BEGIN
|
|||
-- Dump all global variables except those
|
||||
-- that are supposed to change
|
||||
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
|
||||
WHERE variable_name != 'timestamp' AND variable_name != "debug"
|
||||
WHERE variable_name != 'timestamp'
|
||||
AND variable_name != 'INNODB_IBUF_MAX_SIZE'
|
||||
ORDER BY variable_name;
|
||||
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
#
|
||||
# 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;
|
||||
|
@ -104,5 +99,4 @@ FLUSH LOGS;
|
|||
# reset variable value to pass testcase checks
|
||||
SET @@global.max_allowed_packet = 1048576;
|
||||
DROP TABLE t1;
|
||||
SET @@global.max_allowed_packet=@old_global_max_allowed_packet;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
set session transaction_prealloc_size=1024*1024*1024*1;
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
TRUE
|
||||
1
|
||||
set session transaction_prealloc_size=1024*1024*1024*2;
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
TRUE
|
||||
1
|
||||
set session transaction_prealloc_size=1024*1024*1024*3;
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
TRUE
|
||||
1
|
||||
set session transaction_prealloc_size=1024*1024*1024*4;
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
TRUE
|
||||
1
|
||||
set session transaction_prealloc_size=1024*1024*1024*5;
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
TRUE
|
||||
1
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*1;
|
||||
SHOW PROCESSLIST;
|
||||
Id User Host db Command Time State Info
|
||||
<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
|
||||
SHOW PROCESSLIST;
|
||||
Id User Host db Command Time State Info
|
||||
<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
|
||||
SHOW PROCESSLIST;
|
||||
Id User Host db Command Time State Info
|
||||
<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
|
||||
SHOW PROCESSLIST;
|
||||
Id User Host db Command Time State Info
|
||||
<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
|
||||
SHOW PROCESSLIST;
|
||||
Id User Host db Command Time State Info
|
||||
<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST
|
||||
|
|
|
@ -23,16 +23,6 @@
|
|||
# This is a big test.
|
||||
--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 #
|
||||
|
@ -154,14 +144,9 @@ let $MYSQLD_DATADIR= `select @@datadir`;
|
|||
eval SET @@global.max_allowed_packet = $orig_max_allowed_packet;
|
||||
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:
|
||||
#
|
||||
--remove_file $MYSQLTEST_VARDIR/$mysqlbinlog_output
|
||||
|
||||
disconnect con1
|
||||
disconnect con2
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
--source include/big_test.inc
|
||||
|
||||
#
|
||||
# Bug #27322 failure to allocate transaction_prealloc_size causes crash
|
||||
# Bug#27322 failure to allocate transaction_prealloc_size causes crash
|
||||
#
|
||||
#
|
||||
# Manual (6.0):
|
||||
|
@ -35,20 +35,21 @@
|
|||
# timeout if the testing box is not powerful enough.
|
||||
#
|
||||
|
||||
set @pid_temp = (select ID from information_schema.processlist);
|
||||
set session transaction_prealloc_size=1024*1024*1024*1;
|
||||
--replace_column 1 #
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
set session transaction_prealloc_size=1024*1024*1024*2;
|
||||
--replace_column 1 #
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
--replace_column 1 #
|
||||
set session transaction_prealloc_size=1024*1024*1024*3;
|
||||
--replace_column 1 #
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
set session transaction_prealloc_size=1024*1024*1024*4;
|
||||
--replace_column 1 #
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
set session transaction_prealloc_size=1024*1024*1024*5;
|
||||
--replace_column 1 #
|
||||
select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
|
||||
--disable_warnings
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*1;
|
||||
--replace_column 1 <Id> 6 <Time>
|
||||
SHOW PROCESSLIST;
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
|
||||
--replace_column 1 <Id> 6 <Time>
|
||||
SHOW PROCESSLIST;
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
|
||||
--replace_column 1 <Id> 6 <Time>
|
||||
SHOW PROCESSLIST;
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
|
||||
--replace_column 1 <Id> 6 <Time>
|
||||
SHOW PROCESSLIST;
|
||||
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
|
||||
--replace_column 1 <Id> 6 <Time>
|
||||
SHOW PROCESSLIST;
|
||||
--enable_warnings
|
||||
|
||||
|
|
Loading…
Reference in a new issue