diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-02-01 19:04:00 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-02-01 19:04:00 +0200 |
| commit | d98067f1a69f0c638d1325d2c1770b666f0078c5 (patch) | |
| tree | 602e9b32304cd1d44a88af7de99171b66c0c41c1 | |
| parent | 23628d123bd2b0fe48e41c79207835c96e329496 (diff) | |
| download | mariadb-git-bb-10.2-elenst-fixes.tar.gz | |
Follow-up for MDEV-9976 - ROWS is now a reserved key wordbb-10.2-elenst-fixes
More test adjustments
5 files changed, 13 insertions, 13 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..281cf190fcf 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` INT) SELECT count(*) INTO `rows` 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..48071b37eba 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` INT) SELECT count(*) INTO `rows` FROM t1; +CREATE PROCEDURE p1(OUT `rows` INT) SELECT count(*) INTO `rows` 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..48071b37eba 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` INT) SELECT count(*) INTO `rows` FROM t1; +CREATE PROCEDURE p1(OUT `rows` INT) SELECT count(*) INTO `rows` 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..b30f067a34f 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` INT) BEGIN -SELECT COUNT(*) INTO rows FROM t1; +SELECT COUNT(*) INTO `rows` 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` INT) BEGIN -SELECT COUNT(*) INTO rows FROM t2; +SELECT COUNT(*) INTO `rows` FROM t2; END; // source include/kill_query.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..be3a4cf0e47 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` INT) BEGIN - SELECT COUNT(*) INTO rows FROM t1; + SELECT COUNT(*) INTO `rows` FROM t1; END; // DELIMITER ;// @@ -203,9 +203,9 @@ 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` INT) BEGIN - SELECT COUNT(*) INTO rows FROM t2; + SELECT COUNT(*) INTO `rows` FROM t2; END; // DELIMITER ;// |