bzr push into mysql-trunk branch (Serge.Kozlov:3886 to 3887) Bug#13923795

[Serge Kozlov]

 3887 Serge Kozlov	2012-04-17
      Bug#13923795: Stop slave where we test and restart master only

    modified:
      mysql-test/suite/rpl/r/rpl_binlog_index.result
      mysql-test/suite/rpl/t/rpl_binlog_index.test
 3886 Alexander Barkov	2012-04-17
      BUG#12537203 post-fix
      Now Item_int, Item_uint, Item_float,Item_decimal, Item_null
      constructors use NameString and a data type for the "name" argument.

    modified:
      sql/handler.cc
      sql/item.cc
      sql/item.h
      sql/item_create.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_xmlfunc.cc
      sql/sp_head.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_index.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_index.result	2012-03-23 20:11:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_index.result	2012-04-17 16:41:47 +0000
@@ -6,20 +6,22 @@ Note	####	Storing MySQL user name or pas
 CREATE TABLE t1 (a INT);
 FLUSH BINARY LOGS;
 INSERT INTO t1 VALUES (1);
+include/stop_slave.inc
 # Shutdown master
 include/rpl_stop_server.inc [server_number=1]
 # Move the master binlog files and the index file to a new place
 # Restart master with log-bin option set to the new path
 # Master has restarted successfully
+include/start_slave.inc
 # Create the master-bin.index file with the old format
+include/stop_slave.inc
 # Shutdown master
 include/rpl_stop_server.inc [server_number=1]
 # Move back the master binlog files
 # Remove the unneeded master-bin.index file
 # Restart master with log-bin option set to default
 # Master has restarted successfully
-# stop slave
-include/stop_slave.inc
+include/start_slave.inc
 include/rpl_stop_server.inc [server_number=2]
 # relocate  binlogs
 # relocate  relay logs

=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_index.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_index.test	2012-01-19 12:23:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_index.test	2012-04-17 16:41:47 +0000
@@ -43,7 +43,7 @@ FLUSH BINARY LOGS;
 INSERT INTO t1 VALUES (1);
 
 sync_slave_with_master;
-
+--source include/stop_slave.inc
 #
 # Test on master
 #
@@ -64,7 +64,9 @@ source include/rpl_start_server.inc;
 --let $include_silent=0
 
 --echo # Master has restarted successfully
-
+--connection slave
+--source include/start_slave.inc
+--connection master
 #
 # Test master can handle old format with directory path in index file
 #
@@ -85,6 +87,9 @@ if (!$is_windows)
 --disable_query_log
 source include/write_var_to_file.inc;
 --enable_query_log
+--sync_slave_with_master
+--source include/stop_slave.inc
+--connection master
 
 --echo # Shutdown master
 --let $rpl_server_number=1
@@ -106,9 +111,10 @@ source include/rpl_start_server.inc;
 
 --echo # Master has restarted successfully
 
-connection slave;
---echo # stop slave
---source include/stop_slave.inc
+--connection slave
+--source include/start_slave.inc
+--sync_with_master
+--connection master
 --let $rpl_server_number= 2
 --source include/rpl_stop_server.inc
 

No bundle (reason: useless for push emails).