List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:April 19 2012 11:02am
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3474 to 3475) WL#6224
View as plain text  
 3475 magnus.blaudd@stripped	2012-04-19
      WL#6224 Adapt MySQL Cluster to 5.6
       - Update .result files ror ndb_rpl since rpl_change_topology.inc
         now masks out the warning number in the warnings produced by
         CHANGE MASTER

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result
      mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result
      mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result
 3474 magnus.blaudd@stripped	2012-04-19
      Bug #13979471 INPLACE ALTER CALLS HANDLER::GET_NO_PARTS() CALLED BEFORE TABLE
      IS CREATED IN SE
       - Set "is_create_table" to TRUE when calling open_table_from_share()
         if the table does not exists in engine yet
       - MCP suggested patch

    modified:
      sql/sql_base.cc
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result	2011-03-29 07:04:55 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result	2012-04-19 10:59:52 +0000
@@ -15,7 +15,7 @@ UPDATE t3, t2 SET e = 2, b = 3 WHERE f =
 NOTE! This testcase is affected by bug11932585
 the above UPDATE is binlogged in own transation
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2)

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 set @@global.slave_exec_mode= 'IDEMPOTENT';
 CREATE TABLE mysql.ndb_apply_status

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 set @@global.slave_exec_mode= 'IDEMPOTENT';
 CREATE TABLE mysql.ndb_apply_status

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 SET default_storage_engine=ndb;
 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 SET default_storage_engine=ndb;
 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (c1 INT KEY) ROW_FORMAT=DYNAMIC ENGINE=NDB;
 INSERT INTO t1 VALUES (1),(2),(3);

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result	2012-04-19 10:59:52 +0000
@@ -1,8 +1,8 @@
 select * from mysql.ndb_apply_status;
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 *** on slave there should be zero rows ***
 select count(*) from mysql.ndb_apply_status;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 ***************** Test 1 ************************
 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
 `nom` char(4) default NULL,

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 ==== Initialize ====
 [on slave]

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1 ( pk int not null auto_increment primary key, b0 bit(64) not null, b1 bit(64) not null, b2 bit(64) not null, b3
 bit(64) not null, b4 bit(64) not null, b5 bit(64) not null, b6 bit(64) not null, b7 bit(64) not null, b8 bit(64) not null, b9 bit(64) not null, b10

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1 (
 a int not null primary key,

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result	2012-04-19 10:59:52 +0000
@@ -1,10 +1,10 @@
 include/rpl_init.inc [topology=1->2->3]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/rpl_connect.inc [creating cluster1]
 include/rpl_connect.inc [creating cluster2]
 include/rpl_connect.inc [creating cluster3]
@@ -76,8 +76,8 @@ server_id	epoch	log_name	start_pos	end_p
 2	#	#	#	#
 include/rpl_change_topology.inc [new topology=1->2,1->3]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/start_slave.inc
 [connection cluster1]
 Now show that cluster 3 is successfully replicating from Cluster1

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1 (a int primary key,
 b varchar(100) default 'b',

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE `loadreptable` (
 `nid` int(11) NOT NULL,

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 Variable_name	Value
 binlog_format	MIXED

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result	2012-03-13 09:17:16 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result	2012-04-19 10:59:52 +0000
@@ -1,10 +1,10 @@
 include/rpl_init.inc [topology=1->2->1]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/rpl_connect.inc [creating master]
 include/rpl_connect.inc [creating slave]
 CREATE TABLE t1 (a int key, b int) ENGINE=ndb;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result	2012-04-19 10:59:52 +0000
@@ -1,10 +1,10 @@
 include/rpl_init.inc [topology=1->2,4->3]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/rpl_connect.inc [creating master]
 include/rpl_connect.inc [creating master1]
 include/rpl_connect.inc [creating slave]

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result	2012-04-19 10:59:52 +0000
@@ -1,10 +1,10 @@
 include/rpl_init.inc [topology=1->2,4->3]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/rpl_connect.inc [creating master]
 include/rpl_connect.inc [creating master1]
 include/rpl_connect.inc [creating slave]
@@ -68,11 +68,11 @@ Now swap replication channels around
 include/rpl_stop_slaves.inc
 include/rpl_change_topology.inc [new topology=2->1,3->4]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 Get current master status on Cluster A new master (next pos in Binlog)
 Master1 (3)
 Flush logs to ensure any pending update (e.g. reflected apply_status write row)

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (a int key, b int) ENGINE=NDB;
 SHOW TABLES;
@@ -13,8 +13,8 @@ INSERT INTO t1 VALUES (2,3);
 STOP SLAVE;
 include/rpl_change_topology.inc [new topology=1->2->1]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 START SLAVE;
 include/wait_for_slave_to_start.inc
 include/check_slave_is_running.inc

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result	2012-02-23 12:37:59 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 insert into mysql.ndb_replication values ("test", "t1_old", 0, 7, "NDB$OLD(X)");
 insert into mysql.ndb_replication values ("test", "t1_max", 0, 7, "NDB$MAX(X)");

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 Setup circular replication
 RESET MASTER;
@@ -12,8 +12,8 @@ where variable_name like 'server_id';
 3
 CHANGE MASTER TO master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	1757	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1758	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.
 START SLAVE;
 select @master_server_id:=(variable_value+0)
 from information_schema.global_variables

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 Setup circular replication
 RESET MASTER;
@@ -12,8 +12,8 @@ where variable_name like 'server_id';
 3
 CHANGE MASTER TO master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	1757	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1758	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.
 START SLAVE;
 select @master_server_id:=(variable_value+0)
 from information_schema.global_variables

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 *** Test 1 ********************************************************
 * test native NDB$MAX() conflict resolution

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 *** Test 1 ********************************************************
 * test native NDB$MAX_DELETE_WIN() conflict resolution

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 *** Test 1 ********************************************************
 * test native NDB$OLD() conflict resolution

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 ***** Test 1 RPL of CDD and Alter *****
 ***** Test 1 setup *****

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 DROP TABLE IF EXISTS t1;
 CREATE LOGFILE GROUP lg1

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1 ( a int ) engine = ndb;
 begin;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 DROP DATABASE IF EXISTS replica;
 CREATE DATABASE replica;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (
 id INT UNSIGNED NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result	2012-02-23 12:37:59 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1(pk int not null primary key, i int) engine = ndb;
 select count(*) from t1;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (c1 CHAR(15), c2 CHAR(15), c3 INT, PRIMARY KEY (c3)) ENGINE = NDB ;
 INSERT INTO t1 VALUES ("row1","will go away",1);

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 delete from mysql.ndb_apply_status;
 use mysql;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 reset master;
 stop slave;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 SET default_storage_engine=innodb;
 --- Doing pre test cleanup --- 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1 (a int, unique(a)) engine=ndbcluster;
 create table t2 (a int, unique(a)) engine=innodb;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 **** Test 1 ****
 delete from mysql.ndb_replication;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE tmyisam (a int) ENGINE = MYISAM;
 CREATE TABLE tinnodb (a int) ENGINE = INNODB;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 
 *** Test 1 ***

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result	2012-04-19 10:59:52 +0000
@@ -1,8 +1,8 @@
 ==== Initialization ====
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 ---- setup master ----
 CREATE TABLE myisam_innodb (a INT) ENGINE=MYISAM;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc [rpl_server_count=3]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (c1 CHAR(15), c2 CHAR(15), c3 INT, PRIMARY KEY (c3)) ENGINE = NDB ;
 CREATE TABLE t2 (a int key) ENGINE = NDB ;
@@ -37,8 +37,8 @@ master-bin.000001	#	Query	3	#	COMMIT
 set SQL_LOG_BIN=1;
 include/rpl_change_topology.inc [new topology=3->2]
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 include/start_slave.inc
 INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);
 DELETE FROM t1 WHERE c3 = 1;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 SET default_storage_engine=myisam;
 --- Doing pre test cleanup --- 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result	2012-01-26 14:32:08 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 Wrong schema for the table, too few pks
 create table t1 (a int key, X int) engine ndb;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 DROP DATABASE IF EXISTS replica;
 CREATE DATABASE replica;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 create table t1(pk int not null primary key, i int) engine = ndb;
 select count(*) from t1;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (c1 CHAR(15), c2 CHAR(15), c3 INT, PRIMARY KEY (c3)) ENGINE = NDB ;
 CREATE TABLE t2 (a int key) ENGINE = NDB ;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 SET binlog_format = STATEMENT;
 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 STOP SLAVE;
 CREATE DATABASE ndbsynctest;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (pk int primary key, uk int not null, unique(uk)) engine=ndb;
 insert into t1 values (1,1);

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (pk int primary key, uk int not null, unique(uk)) engine=ndb;
 STOP SLAVE;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result	2012-01-04 20:25:40 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 CREATE TABLE t1 (pk int primary key, uk1 int not null, uk2 int not null,
 unique(uk1), unique(uk2)) engine=ndb;

=== modified file 'mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result	2012-03-14 12:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;

=== modified file 'mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result'
--- a/mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result	2012-03-14 12:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result	2012-04-19 10:59:52 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-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.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+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.
 [connection master]
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3474 to 3475) WL#6224magnus.blaudd20 Apr