database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Test suite fixes:

Browse Source 
- 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:
unknown
2009-10-04 01:20:51 +02:00
parent 59f80387ba
commit 02c33646b3
5 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/mysqlbinlog_row_big.result
View File

@@ -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

40
mysql-test/r/variables-big.result
View File

@@ -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