List:Commits« Previous MessageNext Message »
From:Magne Mahre Date:February 15 2011 11:47am
Subject:bzr commit into mysql-trunk branch (magne.mahre:3649) WL#5185
View as plain text  
#At file:///export/home/tmp/x/mysql-trunk-wl5185-flush/ based on revid:alexander.barkov@stripped

 3649 Magne Mahre	2011-02-15
      WL#5185 Remove deprecated FLUSH <MASTER|SLAVE> syntax
      
      "FLUSH MASTER" has been deprecated since MySQL 5.1, and
      is now removed.  Use "RESET MASTER" instead
      
      "FLUSH SLAVE" has been deprecated since MySQL 5.1, and
      is now removed.  Use "RESET SLAVE" instead

    modified:
      mysql-test/r/ps.result
      mysql-test/r/sp-error.result
      mysql-test/r/trigger.result
      mysql-test/t/ps.test
      mysql-test/t/sp-error.test
      mysql-test/t/trigger.test
      sql/sql_yacc.yy
=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2010-11-29 13:30:18 +0000
+++ b/mysql-test/r/ps.result	2011-02-15 11:47:33 +0000
@@ -2245,32 +2245,6 @@ execute abc;
 execute abc;
 execute abc;
 deallocate prepare abc;
-create procedure proc_1() flush slave;
-call proc_1();
-call proc_1();
-call proc_1();
-create function func_1() returns int begin flush slave; return 1; end|
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create function func_1() returns int begin call proc_1(); return 1; end|
-select func_1(), func_1(), func_1() from dual;
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-drop function func_1;
-drop procedure proc_1;
-prepare abc from "flush slave";
-execute abc;
-execute abc;
-execute abc;
-deallocate prepare abc;
-create procedure proc_1() flush master;
-create function func_1() returns int begin flush master; return 1; end|
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create function func_1() returns int begin call proc_1(); return 1; end|
-select func_1(), func_1(), func_1() from dual;
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-drop function func_1;
-drop procedure proc_1;
-prepare abc from "flush master";
-deallocate prepare abc;
 create procedure proc_1() flush des_key_file;
 call proc_1();
 call proc_1();

=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2010-10-27 10:28:09 +0000
+++ b/mysql-test/r/sp-error.result	2011-02-15 11:47:33 +0000
@@ -665,12 +665,6 @@ ERROR 0A000: FLUSH is not allowed in sto
 create function bug8409() returns int begin flush status;
 return 1; end|
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create function bug8409() returns int begin flush slave;
-return 1; end|
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create function bug8409() returns int begin flush master;
-return 1; end|
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
 create function bug8409() returns int begin flush des_key_file;
 return 1; end|
 ERROR 0A000: FLUSH is not allowed in stored function or trigger

=== modified file 'mysql-test/r/trigger.result'
--- a/mysql-test/r/trigger.result	2010-11-10 11:26:45 +0000
+++ b/mysql-test/r/trigger.result	2011-02-15 11:47:33 +0000
@@ -640,10 +640,6 @@ create trigger t1_ai after insert on t1
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
 create trigger t1_ai after insert on t1 for each row flush status;
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create trigger t1_ai after insert on t1 for each row flush slave;
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-create trigger t1_ai after insert on t1 for each row flush master;
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
 create trigger t1_ai after insert on t1 for each row flush des_key_file;
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
 create trigger t1_ai after insert on t1 for each row flush user_resources;
@@ -694,14 +690,6 @@ create procedure p1() flush status;
 insert into t1 values (0);
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
 drop procedure p1;
-create procedure p1() flush slave;
-insert into t1 values (0);
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-drop procedure p1;
-create procedure p1() flush master;
-insert into t1 values (0);
-ERROR 0A000: FLUSH is not allowed in stored function or trigger
-drop procedure p1;
 create procedure p1() flush des_key_file;
 insert into t1 values (0);
 ERROR 0A000: FLUSH is not allowed in stored function or trigger

=== modified file 'mysql-test/t/ps.test'
--- a/mysql-test/t/ps.test	2010-11-13 15:05:02 +0000
+++ b/mysql-test/t/ps.test	2011-02-15 11:47:33 +0000
@@ -2305,40 +2305,6 @@ execute abc;
 deallocate prepare abc;
 
 
-create procedure proc_1() flush slave;
-call proc_1();
-call proc_1();
-call proc_1();
-delimiter |;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create function func_1() returns int begin flush slave; return 1; end|
-create function func_1() returns int begin call proc_1(); return 1; end|
-delimiter ;|
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-select func_1(), func_1(), func_1() from dual;
-drop function func_1;
-drop procedure proc_1;
-prepare abc from "flush slave";
-execute abc;
-execute abc;
-execute abc;
-deallocate prepare abc;
-
-
-create procedure proc_1() flush master;
-delimiter |;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create function func_1() returns int begin flush master; return 1; end|
-create function func_1() returns int begin call proc_1(); return 1; end|
-delimiter ;|
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-select func_1(), func_1(), func_1() from dual;
-drop function func_1;
-drop procedure proc_1;
-prepare abc from "flush master";
-deallocate prepare abc;
-
-
 create procedure proc_1() flush des_key_file;
 call proc_1();
 call proc_1();

=== modified file 'mysql-test/t/sp-error.test'
--- a/mysql-test/t/sp-error.test	2010-10-26 11:48:08 +0000
+++ b/mysql-test/t/sp-error.test	2011-02-15 11:47:33 +0000
@@ -931,12 +931,6 @@ return 1; end|
 create function bug8409() returns int begin flush status;
 return 1; end|
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create function bug8409() returns int begin flush slave;
-return 1; end|
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create function bug8409() returns int begin flush master;
-return 1; end|
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 create function bug8409() returns int begin flush des_key_file;
 return 1; end|
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

=== modified file 'mysql-test/t/trigger.test'
--- a/mysql-test/t/trigger.test	2010-08-18 10:18:27 +0000
+++ b/mysql-test/t/trigger.test	2011-02-15 11:47:33 +0000
@@ -669,10 +669,6 @@ create trigger t1_ai after insert on t1
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 create trigger t1_ai after insert on t1 for each row flush status;
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create trigger t1_ai after insert on t1 for each row flush slave;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-create trigger t1_ai after insert on t1 for each row flush master;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 create trigger t1_ai after insert on t1 for each row flush des_key_file;
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 create trigger t1_ai after insert on t1 for each row flush user_resources;
@@ -734,16 +730,6 @@ create procedure p1() flush status;
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 insert into t1 values (0);
 
-drop procedure p1;
-create procedure p1() flush slave;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-insert into t1 values (0);
-
-drop procedure p1;
-create procedure p1() flush master;
---error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
-insert into t1 values (0);
-
 drop procedure p1;
 create procedure p1() flush des_key_file;
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-02-03 10:13:06 +0000
+++ b/sql/sql_yacc.yy	2011-02-15 11:47:33 +0000
@@ -11459,10 +11459,6 @@ flush_option:
           { Lex->type|= REFRESH_LOG; }
         | STATUS_SYM
           { Lex->type|= REFRESH_STATUS; }
-        | SLAVE
-          { Lex->type|= REFRESH_SLAVE; }
-        | MASTER_SYM
-          { Lex->type|= REFRESH_MASTER; }
         | DES_KEY_FILE
           { Lex->type|= REFRESH_DES_KEY_FILE; }
         | RESOURCES


Attachment: [text/bzr-bundle] bzr/magne.mahre@oracle.com-20110215114733-al6941u3zk3j46v6.bundle
Thread
bzr commit into mysql-trunk branch (magne.mahre:3649) WL#5185Magne Mahre15 Feb