bzr push into mysql-trunk branch (Georgi.Kodinov:3638)

[Georgi Kodinov]

 3638 Georgi Kodinov	2011-11-21 [merge]
      merge

    modified:
      mysql-test/r/metadata.result
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/opt_trace/r/temp_table.result
      sql/filesort.cc
      sql/sql_select.cc
      storage/innobase/buf/buf0buf.c
=== modified file 'mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result'
--- a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2011-11-09 09:33:14 +0000
+++ b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 set @save_general_log = @@global.general_log;
 set @save_log_output = @@global.log_output;
@@ -12,8 +12,8 @@ include/stop_slave.inc
 change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
 master_user = 'root', master_heartbeat_period = 0;
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
 include/start_slave.inc
 include/stop_slave.inc

=== modified file 'mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result'
--- a/mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result	2011-11-09 09:33:14 +0000
+++ b/mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result'
--- a/mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result	2011-11-09 09:33:14 +0000
+++ b/mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/parts/r/rpl_partition.result'
--- a/mysql-test/suite/parts/r/rpl_partition.result	2011-11-09 09:33:14 +0000
+++ b/mysql-test/suite/parts/r/rpl_partition.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result	2011-11-07 16:17:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 # Test case1: INVOKES A TRIGGER with after insert action
 create table t1(a int, b int) engine=innodb;

=== modified file 'mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result'
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-11-07 16:17:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2011-11-07 16:17:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2011-11-21 09:59:30 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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	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.
 [connection master]
 create database d1;
 use d1;

=== removed file 'mysql-test/suite/rpl/r/rpl_parallel_benchmark.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	2011-11-07 16:17:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	1754	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1755	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 @save.slave_parallel_workers= @@global.slave_parallel_workers;
-call mtr.add_suppression('Slave: Error dropping database');
-include/stop_slave.inc
-start slave;
-stop slave sql_thread;
-use test;
-select * from test1.benchmark into outfile  'benchmark.out';
-select ts from test1.benchmark where state like 'master started load' into @m_0;
-select ts from test1.benchmark where state like 'master ends load' into @m_1;
-select ts from test1.benchmark where state like 'slave takes on load' into @s_0;
-select ts from test1.benchmark where state like 'slave ends load' into @s_1;
-select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta.out';
-include/rpl_end.inc

No bundle (reason: useless for push emails).