mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +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:
@@ -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
|
||||
|
Reference in New Issue
Block a user