mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Speed up some PBXT tests by adding begin...commit around creating of testing tables. include/my_base.h: Fixed wrong constant mysql-test/mysql-test-run.pl: Print MariaDB instead of MySQL mysql-test/r/range.result: Move test that required partitions to parts.optimizer mysql-test/suite/innodb_plugin/t/disabled.def: Disable test that causes valgrind warning about not released memory in xtradb mysql-test/suite/parts/r/optimizer.result: Moved from range.result mysql-test/suite/parts/t/optimizer.test: Moved from range.test mysql-test/suite/pbxt/r/join_nested.result: Updated results after optimizer changes mysql-test/suite/pbxt/r/renamedb.result: Updated test for new error message mysql-test/suite/pbxt/t/check.test: Speed up test mysql-test/suite/pbxt/t/count_distinct2.test: Speed up test mysql-test/suite/pbxt/t/derived.test: Speed up test mysql-test/suite/pbxt/t/renamedb.test: Updated test for new error message mysql-test/suite/rpl/r/rpl_log_pos.result: Updated results mysql-test/suite/rpl/t/rpl_log_pos.test: Update test to read from a position that has 'known wrong' data. The orignal test read a timestamp, so the error message could differ between runs. mysql-test/suite/rpl/t/rpl_temporary_errors.test: Sync to slave to make test predictable mysql-test/t/events_time_zone.test: Extend wait to make test predictable mysql-test/t/range.test: Move test that required partitions to parts.optimizer sql/sql_list.h: Fixed compiler warning sql/sql_load.cc: buffer was not freed in some error conditions tests/mysql_client_test.c: Fixed compiler warning
84 lines
2.3 KiB
Plaintext
84 lines
2.3 KiB
Plaintext
source include/master-slave.inc;
|
|
source include/have_innodb.inc;
|
|
|
|
call mtr.add_suppression("Deadlock found");
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
SET SESSION BINLOG_FORMAT=ROW;
|
|
CREATE TABLE t1 (a INT PRIMARY KEY, b INT);
|
|
INSERT INTO t1 VALUES (1,1), (2,2), (3,3), (4,4);
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SHOW STATUS LIKE 'Slave_retried_transactions';
|
|
# since bug#31552/31609 idempotency is not default any longer. In order
|
|
# the following UPDATE t1 to pass the mode is switched temprorarily
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
UPDATE t1 SET a = 5, b = 47 WHERE a = 1;
|
|
SELECT * FROM t1;
|
|
--echo **** On Master ****
|
|
connection master;
|
|
UPDATE t1 SET a = 5, b = 5 WHERE a = 1;
|
|
SELECT * FROM t1;
|
|
#SHOW BINLOG EVENTS;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
set @@global.slave_exec_mode= default;
|
|
SHOW STATUS LIKE 'Slave_retried_transactions';
|
|
SELECT * FROM t1;
|
|
source include/check_slave_is_running.inc;
|
|
DROP TABLE t1;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
SET SQL_LOG_BIN= 0;
|
|
DROP TABLE t1;
|
|
SET SQL_LOG_BIN= 1;
|
|
|
|
# BUG#Bug #53259 Unsafe statement binlogged in statement format w/MyIsam temp tables
|
|
#
|
|
SET SESSION BINLOG_FORMAT=MIXED;
|
|
CREATE TABLE t_myisam (id INT, PRIMARY KEY (id)) engine= MyIsam;
|
|
INSERT INTO t_myisam (id) VALUES(1);
|
|
CREATE TABLE t_innodb (id INT) engine= Innodb;
|
|
INSERT INTO t_innodb (id) VALUES(1);
|
|
|
|
let $binlog_start= query_get_value("SHOW MASTER STATUS", Position, 1);
|
|
BEGIN;
|
|
INSERT INTO t_innodb(id) VALUES(2);
|
|
INSERT INTO t_myisam(id) VALUES(3);
|
|
CREATE TEMPORARY TABLE x (id INT);
|
|
--error 1062
|
|
INSERT INTO t_myisam(id) VALUES(4),(1);
|
|
INSERT INTO t_innodb(id) VALUES(5);
|
|
COMMIT;
|
|
|
|
SELECT * FROM t_innodb;
|
|
SELECT * FROM t_myisam;
|
|
|
|
--sync_slave_with_master
|
|
|
|
SELECT * FROM t_innodb;
|
|
SELECT * FROM t_myisam;
|
|
|
|
--connection master
|
|
|
|
BEGIN;
|
|
CREATE TEMPORARY TABLE tmp2 SELECT * FROM t_innodb;
|
|
INSERT INTO t_innodb(id) VALUES(1);
|
|
INSERT INTO t_innodb(id) VALUES(1);
|
|
ROLLBACK;
|
|
source include/show_binlog_events.inc;
|
|
|
|
DROP TABLE t_myisam, t_innodb;
|
|
|
|
# We must wait for the slave to stop.
|
|
# Otherwise the warnings in the error log about deadlock may be written to
|
|
# the error log only during shutdown, and currently the suppression of
|
|
# "Deadlock found" set in this test case is not effective during server
|
|
# shutdown.
|
|
--sync_slave_with_master
|
|
connection slave;
|
|
STOP SLAVE;
|
|
--source include/wait_for_slave_to_stop.inc
|