Skip to content

Commit 2e51808

Browse files
author
Serge Kozlov
committed
Bug#13869905
1 parent b03de40 commit 2e51808

File tree

390 files changed

+1204
-1078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

390 files changed

+1204
-1078
lines changed

‎mysql-test/extra/rpl_tests/rpl_change_master.test

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ if ($read_pos == $exec_pos)
3232
echo 'Read_Master_Log_Pos: $read_pos' == 'Exec_Master_Log_Pos: $exec_pos';
3333
die Failed because Read_Master_Log_Pos is equal to Exec_Master_Log_Pos;
3434
}
35+
--replace_column 2 ####
3536
change master to master_user='root';
3637
let $read_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1);
3738
let $exec_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);

‎mysql-test/extra/rpl_tests/rpl_loaddata.test

+2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ connection slave;
100100

101101
# CHANGE MASTER and see if error is cleared in SHOW SLAVE STATUS.
102102
--source include/stop_slave_io.inc
103+
--replace_column 2 ####
103104
change master to master_user='test';
105+
--replace_column 2 ####
104106
change master to master_user='root';
105107
--source include/check_slave_no_error.inc
106108

‎mysql-test/extra/rpl_tests/rpl_reset_slave.test

+7
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ let $status_items= Master_User, Master_Host;
1717
source include/show_slave_status.inc;
1818

1919
source include/stop_slave.inc;
20+
--replace_column 2 ####
2021
change master to master_user='test';
2122
source include/show_slave_status.inc;
2223

2324
reset slave;
2425
source include/show_slave_status.inc;
2526

27+
--replace_column 2 ####
2628
change master to master_user='root';
2729
source include/start_slave.inc;
2830
sync_with_master;
@@ -56,12 +58,14 @@ source include/check_slave_no_error.inc;
5658
# verifying start slave resets Last_IO_Error and Last_IO_Errno.
5759
#
5860

61+
--replace_column 2 ####
5962
change master to master_user='impossible_user_name';
6063
start slave;
6164
let $slave_io_errno= 1045;
6265
--source include/wait_for_slave_io_error.inc
6366
--source include/stop_slave_sql.inc
6467

68+
--replace_column 2 ####
6569
change master to master_user='root';
6670
source include/start_slave.inc;
6771
source include/check_slave_no_error.inc;
@@ -71,6 +75,7 @@ source include/check_slave_no_error.inc;
7175
#
7276

7377
stop slave;
78+
--replace_column 2 ####
7479
change master to master_user='impossible_user_name';
7580
start slave;
7681
let $slave_io_errno= 1045;
@@ -79,6 +84,7 @@ let $slave_io_errno= 1045;
7984

8085
reset slave;
8186
source include/check_slave_no_error.inc;
87+
--replace_column 2 ####
8288
change master to master_user='root';
8389

8490

@@ -105,6 +111,7 @@ if ($_show_master_host != No such row)
105111
}
106112

107113
--replace_result $_slave_master_host MASTER_HOST $_slave_master_user MASTER_USER $_slave_master_port MASTER_PORT
114+
--replace_column 2 ####
108115
--eval CHANGE MASTER TO MASTER_HOST= '$_slave_master_host', MASTER_USER= '$_slave_master_user', MASTER_PORT= $_slave_master_port
109116
--source include/start_slave.inc
110117

‎mysql-test/include/rpl_change_topology.inc

+1
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ if (!$rpl_skip_change_master)
269269
--let $_rpl_change_master_position= $_rpl_change_master_position, MASTER_LOG_POS = $_rpl_master_log_pos
270270
}
271271
}
272+
--replace_regex /[0-9]{4}/####/
272273
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', $_rpl_change_master_position, MASTER_CONNECT_RETRY = 1;
273274
}
274275
if ($_rpl_master == '')

‎mysql-test/suite/rpl/r/rpl_000010.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create table t1 (n int not null auto_increment primary key);
77
insert into t1 values(NULL);

‎mysql-test/suite/rpl/r/rpl_000011.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create table t1 (n int);
77
insert into t1 values(1);

‎mysql-test/suite/rpl/r/rpl_000013.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create table t2(n int);
77
create temporary table t1 (n int);

‎mysql-test/suite/rpl/r/rpl_000017.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
77
grant replication slave on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';

‎mysql-test/suite/rpl/r/rpl_DML_error.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
# Verify the statements can be binlogged correctly when error happens
77
# ------------------------------------------------------------------

‎mysql-test/suite/rpl/r/rpl_EE_err.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create table t1 (a int) engine=myisam;
77
flush tables;

‎mysql-test/suite/rpl/r/rpl_LD_INFILE.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
DROP TABLE IF EXISTS test.t1;
77
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));

‎mysql-test/suite/rpl/r/rpl_alter.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create database mysqltest;
77
create table mysqltest.t1 ( n int);

‎mysql-test/suite/rpl/r/rpl_alter_db.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
==== Verify that alter database does not stop replication ====
77
create database temp_db;

‎mysql-test/suite/rpl/r/rpl_alter_repository.result

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
include/stop_slave.inc
77
SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -69,8 +69,8 @@ ALTER TABLE mysql.slave_relay_log_info ADD COLUMN (Sql_delay INTEGER NOT NULL CO
6969
RESET SLAVE ALL;
7070
CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT, MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_LOG_POS;
7171
Warnings:
72-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
73-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
72+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
73+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
7474
include/start_slave.inc
7575
ALTER TABLE mysql.slave_master_info DROP COLUMN Retry_count;
7676
INSERT INTO t_innodb VALUES (1), (2), (3);
@@ -96,8 +96,8 @@ ALTER TABLE mysql.slave_master_info ADD COLUMN (Retry_count BIGINT UNSIGNED NOT
9696
RESET SLAVE ALL;
9797
CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT, MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_LOG_POS;
9898
Warnings:
99-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
100-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
99+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
100+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
101101
include/start_slave.inc
102102
ANALYZE TABLE mysql.slave_master_info, mysql.slave_relay_log_info;
103103
Table Op Msg_type Msg_text

‎mysql-test/suite/rpl/r/rpl_auto_increment.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3;
77
insert into t1 values (NULL,1),(NULL,2),(NULL,3);

‎mysql-test/suite/rpl/r/rpl_auto_increment_11932.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
77
drop database if exists test1;

‎mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
==== Initialize ====
77
SET @old_relay_log_purge= @@global.relay_log_purge;

‎mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
# Test case1: INVOKES A TRIGGER with after insert action
77
create table t1(a int, b int) engine=innodb;

‎mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
77
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

‎mysql-test/suite/rpl/r/rpl_binlog_corruption.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
call mtr.add_suppression('Found invalid event in binary log');
77
call mtr.add_suppression('Slave SQL.*Relay log read failure: Could not parse relay log event entry.* 1594');

‎mysql-test/suite/rpl/r/rpl_binlog_errors.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
#######################################################################
77
####################### PART 1: MASTER TESTS ##########################

‎mysql-test/suite/rpl/r/rpl_binlog_grant.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
create database d1;
77
use d1;

‎mysql-test/suite/rpl/r/rpl_binlog_index.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
CREATE TABLE t1 (a INT);
77
FLUSH BINARY LOGS;

‎mysql-test/suite/rpl/r/rpl_bit.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include/master-slave.inc
22
Warnings:
3-
Note 1756 Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note 1757 Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
55
[connection master]
66
DROP TABLE IF EXISTS test.t1;
77
CREATE TABLE test.t1 (

0 commit comments

Comments
 (0)