bzr push into mysql-trunk branch (nuno.carvalho:3840 to 3841) Bug#11758581

[Nuno Carvalho]

 3841 Nuno Carvalho	2012-02-03
      BUG#11758581 - 50801: CHANGE MASTER ACCEPTS BOGUS VARIABLES
            
      CHANGE MASTER command did not check invalid characters on its
      parameters. Also on server restart, invalid values were trimmed causing
      the loss of part of the variables value.
      
      Ensure that servers have a clean state before bogus variables tests.

    modified:
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/rpl_change_master.test
 3840 Nuno Carvalho	2012-02-03
      BUG#11758581 - 50801: CHANGE MASTER ACCEPTS BOGUS VARIABLES
      
      CHANGE MASTER command did not check invalid characters on its
      parameters. Also on server restart, invalid values were trimmed causing
      the loss of part of the variables value.
      
      SQL parser was improved to prohibit the use of new line characters on 
      CHANGE MASTER variables, throwing a ER_WRONG_VALUE error when such 
      character is used.

    modified:
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/rpl_change_master.test
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2012-02-03 18:09:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2012-02-03 23:52:29 +0000
@@ -96,6 +96,7 @@ drop table t1;
 include/stop_slave.inc
 CHANGE MASTER TO master_host='SAVE_MASTER_HOST';
 include/start_slave.inc
+include/rpl_reset.inc
 include/stop_slave.inc
 CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='', MASTER_PORT=MASTER_PORT;
 ERROR HY000: Incorrect arguments to MASTER_HOST

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2012-02-03 18:09:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2012-02-03 23:52:29 +0000
@@ -15,6 +15,7 @@
 
 # BUG#11758581 - 50801: CHANGE MASTER ACCEPTS BOGUS VARIABLES
 # We want to check if CHANGE MASTER values have newline characters.
+--source include/rpl_reset.inc
 connection slave;
 
 ###

No bundle (reason: useless for push emails).