diff options
5 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog_write_error.inc b/mysql-test/extra/binlog_tests/binlog_write_error.inc index da66dbf5a95..fa3ba087a7e 100644 --- a/mysql-test/extra/binlog_tests/binlog_write_error.inc +++ b/mysql-test/extra/binlog_tests/binlog_write_error.inc @@ -71,7 +71,7 @@ source include/binlog_inject_error.inc; let $query= DROP VIEW v1; source include/binlog_inject_error.inc; -let $query= CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; +let $query= CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1; source include/binlog_inject_error.inc; let $query= DROP PROCEDURE p1; diff --git a/mysql-test/suite/binlog/r/binlog_write_error.result b/mysql-test/suite/binlog/r/binlog_write_error.result index 28cffb3a8e5..2606a9f40b3 100644 --- a/mysql-test/suite/binlog/r/binlog_write_error.result +++ b/mysql-test/suite/binlog/r/binlog_write_error.result @@ -59,8 +59,8 @@ DROP VIEW v1; ERROR HY000: Error writing file 'master-bin' ((errno: #) SET GLOBAL debug_dbug=''; SET GLOBAL debug_dbug='d,injecting_fault_writing'; -CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; -CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; +CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1; +CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) SET GLOBAL debug_dbug=''; SET GLOBAL debug_dbug='d,injecting_fault_writing'; diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.result b/mysql-test/suite/binlog_encryption/binlog_write_error.result index 28cffb3a8e5..2606a9f40b3 100644 --- a/mysql-test/suite/binlog_encryption/binlog_write_error.result +++ b/mysql-test/suite/binlog_encryption/binlog_write_error.result @@ -59,8 +59,8 @@ DROP VIEW v1; ERROR HY000: Error writing file 'master-bin' ((errno: #) SET GLOBAL debug_dbug=''; SET GLOBAL debug_dbug='d,injecting_fault_writing'; -CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; -CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; +CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1; +CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) SET GLOBAL debug_dbug=''; SET GLOBAL debug_dbug='d,injecting_fault_writing'; diff --git a/mysql-test/suite/rpl/r/rpl_killed_ddl.result b/mysql-test/suite/rpl/r/rpl_killed_ddl.result index bb264a12af3..66309432efe 100644 --- a/mysql-test/suite/rpl/r/rpl_killed_ddl.result +++ b/mysql-test/suite/rpl/r/rpl_killed_ddl.result @@ -34,9 +34,9 @@ ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY DO INSERT INTO test.t1 VALUES (1); CREATE FUNCTION f1 () RETURNS INT DETERMINISTIC RETURN 1; -CREATE PROCEDURE p1 (OUT rows INT) +CREATE PROCEDURE p1 (OUT rows_cnt INT) BEGIN -SELECT COUNT(*) INTO rows FROM t1; +SELECT COUNT(*) INTO rows_cnt FROM t1; END; // CREATE SERVER s1 @@ -125,9 +125,9 @@ connection master; include/rpl_diff.inc connection master; connection master1; -CREATE PROCEDURE p2 (OUT rows INT) +CREATE PROCEDURE p2 (OUT rows_cnt INT) BEGIN -SELECT COUNT(*) INTO rows FROM t2; +SELECT COUNT(*) INTO rows_cnt FROM t2; END; // source include/kill_query.inc; @@ -135,7 +135,7 @@ connection master; include/rpl_diff.inc connection master; connection master1; -ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows of table t1'; +ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows_cnt of table t1'; source include/kill_query.inc; connection master; include/rpl_diff.inc diff --git a/mysql-test/suite/rpl/t/rpl_killed_ddl.test b/mysql-test/suite/rpl/t/rpl_killed_ddl.test index 593051700a7..6415b3e8874 100644 --- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test +++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test @@ -83,9 +83,9 @@ CREATE FUNCTION f1 () RETURNS INT DETERMINISTIC RETURN 1; DELIMITER //; -CREATE PROCEDURE p1 (OUT rows INT) +CREATE PROCEDURE p1 (OUT rows_cnt INT) BEGIN - SELECT COUNT(*) INTO rows FROM t1; + SELECT COUNT(*) INTO rows_cnt FROM t1; END; // DELIMITER ;// @@ -203,15 +203,15 @@ source include/kill_query_and_diff_master_slave.inc; --let $rpl_diff_statement= SHOW PROCEDURE STATUS LIKE \'p%\' DELIMITER //; -send CREATE PROCEDURE p2 (OUT rows INT) +send CREATE PROCEDURE p2 (OUT rows_cnt INT) BEGIN - SELECT COUNT(*) INTO rows FROM t2; + SELECT COUNT(*) INTO rows_cnt FROM t2; END; // DELIMITER ;// source include/kill_query_and_diff_master_slave.inc; -send ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows of table t1'; +send ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows_cnt of table t1'; source include/kill_query_and_diff_master_slave.inc; send DROP PROCEDURE p1; |