mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03: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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user