diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/signal.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/signal.result')
| -rw-r--r-- | mysql-test/r/signal.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result index cfa056d5d13..92f1df62dc2 100644 --- a/mysql-test/r/signal.result +++ b/mysql-test/r/signal.result @@ -598,6 +598,8 @@ ERROR 42000: Variable 'MYSQL_ERRNO' can't be set to the value of '0' SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = -1; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = 65535; +ERROR 42000: Variable 'MYSQL_ERRNO' can't be set to the value of '65535' +SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = 65534; ERROR HY000: Unhandled user-defined exception condition # # RESIGNAL can also appear in a query @@ -617,7 +619,7 @@ create procedure test_signal() begin # max range DECLARE foo CONDITION FOR SQLSTATE 'AABBB'; -SIGNAL foo SET MYSQL_ERRNO = 65535; +SIGNAL foo SET MYSQL_ERRNO = 65534; end $$ call test_signal() $$ ERROR AABBB: Unhandled user-defined exception condition @@ -1101,11 +1103,11 @@ TABLE_NAME = hhh, COLUMN_NAME = iii, CURSOR_NAME = jjj, MESSAGE_TEXT = kkk, -MYSQL_ERRNO = 65535; +MYSQL_ERRNO = 65534; end $$ call test_signal() $$ Warnings: -Warning 65535 KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK +Warning 65534 KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK drop procedure test_signal $$ create procedure test_signal() begin |