diff options
| -rw-r--r-- | mysql-test/r/sp-error.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 8d92765d1dd..59cd93d6e7b 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -97,13 +97,13 @@ insert into test.t1 values (x)| create function f(x int) returns int return x+42| call p()| -ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 0 +ERROR 42000: Incorrect number of arguments for PROCEDURE p; expected 1, got 0 call p(1, 2)| -ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 2 +ERROR 42000: Incorrect number of arguments for PROCEDURE p; expected 1, got 2 select f()| -ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 0 +ERROR 42000: Incorrect number of arguments for FUNCTION f; expected 1, got 0 select f(1, 2)| -ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 2 +ERROR 42000: Incorrect number of arguments for FUNCTION f; expected 1, got 2 drop procedure p| drop function f| create procedure p(val int, out res int) @@ -219,7 +219,7 @@ fetch c into x; close c; end| call p()| -ERROR HY000: Wrong number of FETCH variables +ERROR HY000: Incorrect number of FETCH variables drop procedure p| create procedure p() begin @@ -232,7 +232,7 @@ fetch c into x, y, z; close c; end| call p()| -ERROR HY000: Wrong number of FETCH variables +ERROR HY000: Incorrect number of FETCH variables drop procedure p| create procedure p(in x int, x char(10)) begin diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 57fe2577b03..31a0ada1267 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -364,7 +364,7 @@ set sql_log_bin=1; set sql_log_off=1; set sql_log_update=1; Warnings: -Note 1308 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored. +Note 1308 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored set sql_low_priority_updates=1; set sql_max_join_size=200; select @@sql_max_join_size,@@max_join_size; |