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

MDEV-571

Browse Source 
Adjusted test case results after the merge 10.0-base, 10.0-monty.
The results are in sync with MySQL 5.6.7.
This commit is contained in:
unknown
2012-10-22 12:55:29 +03:00
parent cd1de362ed
commit 76d8a43e34
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/alter_table-big.result
View File

@ -14,7 +14,7 @@ set debug_sync='now WAIT_FOR parked';
insert into t2 values (1);
insert into t1 values (1, 1, 1);;
set debug_sync='now SIGNAL go';
show binlog events from <binlog_start>;
include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t2 values (1)
@ -57,7 +57,7 @@ rename table t1 to t3;
drop table t3;
set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
set debug_sync='RESET';
show binlog events from <binlog_start>;
include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test1'
master-bin.000001 # Query # # BEGIN

4
mysql-test/r/create-big.result
View File

@ -186,7 +186,7 @@ t2 CREATE TABLE `t2` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t2;
show binlog events from <binlog_start>;
include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t1 values (1)
@ -214,7 +214,7 @@ drop table t1;;
set debug_sync='now SIGNAL go';
drop table t2;
set debug_sync='RESET';
show binlog events from <binlog_start>;
include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # BEGIN

10
mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
View File

@ -2,20 +2,20 @@ SET @def_var= @@session.transaction_prealloc_size;
SET SESSION transaction_prealloc_size=1024*1024*1024*1;
SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress
<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0.000
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress
<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0.000
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress
<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0.000
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress
<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0.000
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress
<Id> root <Host> test Query <Time> NULL SHOW PROCESSLIST 0.000
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0.000

23
mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
View File

@ -42,35 +42,24 @@ SET @def_var= @@session.transaction_prealloc_size;
--disable_warnings
SET SESSION transaction_prealloc_size=1024*1024*1024*1;
# Embedded server is hardcoded to show "Writing to net" as STATE.
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time>
# Embedded server is hardcoded to show "Writing to net" as STATE.
--replace_result "Writing to net" "NULL"
# Embedded server is shows "cleaning up" as STATE, while non-embedded shows "init"
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /localhost[:0-9]*/localhost/
SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time>
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /localhost[:0-9]*/localhost/
SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time>
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /localhost[:0-9]*/localhost/
SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time>
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /localhost[:0-9]*/localhost/
SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time>
--replace_result "Writing to net" "NULL"
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
SHOW PROCESSLIST;
--enable_warnings