diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 15:36:55 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 15:36:55 +0400 |
| commit | 6b684c5806e0728b42c5c0ab7ae9939ab9dfec93 (patch) | |
| tree | 049b7373511d6970d58fb06d12c2cf4cdc532269 /mysql-test/r/signal.result | |
| parent | c30d924dd5485f24818264d8e533820bcf1bcba0 (diff) | |
| download | mariadb-git-6b684c5806e0728b42c5c0ab7ae9939ab9dfec93.tar.gz | |
Fix test results after the latest merge.
Diffstat (limited to 'mysql-test/r/signal.result')
| -rw-r--r-- | mysql-test/r/signal.result | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result index 56140733c33..e20c6ee7455 100644 --- a/mysql-test/r/signal.result +++ b/mysql-test/r/signal.result @@ -580,7 +580,7 @@ SIGNAL foo; ERROR 42000: Undefined CONDITION: foo SIGNAL SQLSTATE '01000'; Warnings: -Warning 1640 Unhandled user-defined warning condition +Warning 1642 Unhandled user-defined warning condition SIGNAL SQLSTATE '02000'; ERROR 02000: Unhandled user-defined not found condition SIGNAL SQLSTATE '23000'; @@ -694,7 +694,7 @@ SIGNAL warn; end $$ call test_signal() $$ Warnings: -Warning 1640 Unhandled user-defined warning condition +Warning 1642 Unhandled user-defined warning condition drop procedure test_signal $$ create procedure test_signal() begin @@ -704,7 +704,7 @@ SIGNAL warn; end $$ call test_signal() $$ Warnings: -Warning 1640 Unhandled user-defined warning condition +Warning 1642 Unhandled user-defined warning condition drop procedure test_signal $$ create procedure test_signal() begin @@ -853,7 +853,7 @@ SIGNAL warn SET MESSAGE_TEXT = "Something bad happened"; end $$ call test_signal() $$ Warnings: -Warning 1640 Something bad happened +Warning 1642 Something bad happened drop procedure test_signal $$ create procedure test_signal() begin @@ -878,7 +878,7 @@ SIGNAL something SET MESSAGE_TEXT = _utf8 "This is a UTF8 text"; end $$ call test_signal() $$ Warnings: -Warning 1640 This is a UTF8 text +Warning 1642 This is a UTF8 text drop procedure test_signal $$ create procedure test_signal() begin @@ -887,7 +887,7 @@ SIGNAL something SET MESSAGE_TEXT = ""; end $$ call test_signal() $$ Warnings: -Warning 1640 +Warning 1642 drop procedure test_signal $$ create procedure test_signal() begin @@ -896,10 +896,10 @@ SIGNAL warn SET MESSAGE_TEXT = "á a"; end $$ call test_signal() $$ Warnings: -Warning 1640 á a +Warning 1642 á a show warnings $$ Level Code Message -Warning 1640 á a +Warning 1642 á a drop procedure test_signal $$ # # Test SET complex expressions @@ -1162,17 +1162,17 @@ MYSQL_ERRNO = 10000; end $$ call test_signal() $$ Warnings: -Warning 1645 Data truncated for condition item 'CLASS_ORIGIN' -Warning 1645 Data truncated for condition item 'SUBCLASS_ORIGIN' -Warning 1645 Data truncated for condition item 'CONSTRAINT_CATALOG' -Warning 1645 Data truncated for condition item 'CONSTRAINT_SCHEMA' -Warning 1645 Data truncated for condition item 'CONSTRAINT_NAME' -Warning 1645 Data truncated for condition item 'CATALOG_NAME' -Warning 1645 Data truncated for condition item 'SCHEMA_NAME' -Warning 1645 Data truncated for condition item 'TABLE_NAME' -Warning 1645 Data truncated for condition item 'COLUMN_NAME' -Warning 1645 Data truncated for condition item 'CURSOR_NAME' -Warning 1645 Data truncated for condition item 'MESSAGE_TEXT' +Warning 1647 Data truncated for condition item 'CLASS_ORIGIN' +Warning 1647 Data truncated for condition item 'SUBCLASS_ORIGIN' +Warning 1647 Data truncated for condition item 'CONSTRAINT_CATALOG' +Warning 1647 Data truncated for condition item 'CONSTRAINT_SCHEMA' +Warning 1647 Data truncated for condition item 'CONSTRAINT_NAME' +Warning 1647 Data truncated for condition item 'CATALOG_NAME' +Warning 1647 Data truncated for condition item 'SCHEMA_NAME' +Warning 1647 Data truncated for condition item 'TABLE_NAME' +Warning 1647 Data truncated for condition item 'COLUMN_NAME' +Warning 1647 Data truncated for condition item 'CURSOR_NAME' +Warning 1647 Data truncated for condition item 'MESSAGE_TEXT' Warning 10000 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112222222222222222222288888888 drop procedure test_signal $$ create procedure test_signal() |