5.5 merge

2025-08-08 11:22:35 +03:00 · 2014-03-26 22:25:38 +01:00
parent a91c59c2af 44002a34e6
commit 10740939eb
600 changed files with 129062 additions and 121039 deletions
--- a/mysql-test/suite/heap/heap.result
+++ b/mysql-test/suite/heap/heap.result
@@ -758,6 +758,14 @@ SELECT * from t1;
 id	color	ts
 7	GREEN	2
 DROP TABLE t1;
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+SET @@max_heap_table_size = 1024*1024*1024*20;
+CREATE TEMPORARY TABLE tmp ENGINE=MEMORY
+SELECT id FROM t1;
+DROP TEMPORARY TABLE tmp;
+drop table t1;
 #
 # BUG#11825482: Broken key length calculation for btree index
 #
--- a/mysql-test/suite/heap/heap.test
+++ b/mysql-test/suite/heap/heap.test
@@ -510,6 +510,22 @@ DELETE FROM t1 WHERE ts = 1 AND color = 'GREEN';
 SELECT * from t1;
 DROP TABLE t1;

+
+#
+# MDEV-5905 Creating tmp. memory table kills the server
+#
+
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+
+SET @@max_heap_table_size = 1024*1024*1024*20;
+
+CREATE TEMPORARY TABLE tmp ENGINE=MEMORY
+  SELECT id FROM t1;
+DROP TEMPORARY TABLE tmp;
+drop table t1;
+
 --echo #
 --echo # BUG#11825482: Broken key length calculation for btree index
 --echo #
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/server_audit.test
@@ -14,6 +14,7 @@ set global server_audit_logging=on;
 connect (con1,localhost,root,,mysql);
 connection default;
 disconnect con1;
+--sleep 2
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 --error ER_ACCESS_DENIED_ERROR
 connect (con1,localhost,no_such_user,,mysql);
--- a/mysql-test/suite/plugins/t/unix_socket.test
+++ b/mysql-test/suite/plugins/t/unix_socket.test
@@ -1,20 +1,4 @@
--source include/not_embedded.inc
-# If we run this as root, $USER gets authenticated as the `root' user, and we
-# get .result differences from CURRENT_USER().
--source include/not_as_root.inc
-
-# The previous check verifies that the user does not have root permissions. 
-# However in some cases tests are run under a user named 'root',
-# even although this user does not have real root permissions. 
-# This test should be skipped in this case, since it does not expect
-# that there are records in mysql.user where user=<username>
-if ($USER=="root") {
-  skip Cannot be run by user named 'root' even if it does not have all privileges;
-}
-
-if (!$AUTH_SOCKET_SO) {
-  skip No auth_socket plugin;
-}
+--source include/have_unix_socket.inc

 if (!$USER) {
  skip USER variable is undefined;
--- a/mysql-test/suite/rpl/r/rpl_000011.result
+++ b/mysql-test/suite/rpl/r/rpl_000011.result
@@ -2,7 +2,13 @@ include/master-slave.inc
 [connection master]
 create table t1 (n int);
 insert into t1 values(1);
+show global status like 'com_insert';
+Variable_name	Value
+Com_insert	1
 stop slave;
+show global status like 'com_insert';
+Variable_name	Value
+Com_insert	1
 include/wait_for_slave_to_stop.inc
 start slave;
 include/wait_for_slave_to_start.inc
--- a/mysql-test/suite/rpl/t/rpl_000011-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_000011-slave.opt
@@ -0,0 +1 @@
+--verbose=1
--- a/mysql-test/suite/rpl/t/rpl_000011.test
+++ b/mysql-test/suite/rpl/t/rpl_000011.test
@@ -1,9 +1,17 @@
+#
+# Test very simply slave replication (to ensure it works at all)
+# In addition, test also:
+# MDEV-5829 STOP SLAVE resets global status variables
+#
+
 source include/master-slave.inc;

 create table t1 (n int);
 insert into t1 values(1);
 sync_slave_with_master; 
+show global status like 'com_insert';
 stop slave;
+show global status like 'com_insert';
 --source include/wait_for_slave_to_stop.inc
 start slave;
 --source include/wait_for_slave_to_start.inc
--- a/mysql-test/suite/rpl/t/rpl_bug37426.test
+++ b/mysql-test/suite/rpl/t/rpl_bug37426.test
@@ -3,8 +3,8 @@
 #   RBR breaks for CHAR() UTF8 fields > 85 chars
 #############################################################

-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;

 connection master;
 CREATE TABLE char128_utf8 (i1 INT NOT NULL, c CHAR(128) CHARACTER SET utf8 NOT NULL, i2 INT NOT NULL);
--- a/mysql-test/suite/rpl/t/rpl_connection.test
+++ b/mysql-test/suite/rpl/t/rpl_connection.test
@@ -1,6 +1,6 @@
 --source include/not_embedded.inc
--source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc

 #
 # BUG#13427949: CHANGE MASTER TO USER='' (EMPTY USER) CAUSES ERRORS ON VALGRING 
--- a/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
+++ b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
@@ -8,13 +8,14 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state
 source include/have_debug.inc;
 # because of pretend_version_50034_in_binlog the test can't run with checksum
 source include/have_binlog_checksum_off.inc;
-source include/master-slave.inc;
-
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");

 # Currently only statement-based-specific bugs are here
 -- source include/have_binlog_format_statement.inc

+source include/master-slave.inc;
+
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
+
 #
 # This is to test that slave properly detects if
 # master may suffer from:
--- a/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
+++ b/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;

 # It is not possible to replicate FOUND_ROWS() using statement-based
 # replication, but there is a workaround that stores the result of
--- a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
@@ -1,9 +1,9 @@
 #
 # Bug#11760927: 53375: RBR + NO PK => HIGH LOAD ON SLAVE (TABLE SCAN/CPU) => SLAVE FAILURE
 #
--source include/master-slave.inc
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
+--source include/master-slave.inc

 # SETUP
 # - setup log_warnings and debug 
--- a/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
+++ b/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;

 #
 # Bug #30244: row_count/found_rows does not replicate well
--- a/mysql-test/suite/rpl/t/rpl_row_utf32.test
+++ b/mysql-test/suite/rpl/t/rpl_row_utf32.test
@@ -1,6 +1,6 @@
-- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
 -- source include/have_utf32.inc
+-- source include/master-slave.inc

 #
 # BUG#51787 Assertion `(n % 4) == 0' on slave upon INSERT into a table with UTF32
--- a/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
@@ -1,5 +1,5 @@
-- source include/master-slave.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc

 #
 # Bug #51055    Replication failure on duplicate key + traditional SQL mode
--- a/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
@@ -2,9 +2,9 @@
 # Please, check extra/rpl_tests/rpl_stop_middle_group.test.
 ###################################################################################
 -- source include/have_debug.inc
-- source include/master-slave.inc
 -- source include/have_innodb.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc

 SET @@session.binlog_direct_non_transactional_updates= FALSE;
 -- source extra/rpl_tests/rpl_stop_middle_group.test
--- a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
+++ b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
@@ -5,8 +5,8 @@
 # does not exist' base on myisam engine.
 #

-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;

 LET $ENGINE_TYPE= MyISAM;
 source extra/rpl_tests/rpl_tmp_table_and_DDL.test;