diff options
| author | unknown <pem@mysql.comhem.se> | 2003-10-23 16:06:51 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-10-23 16:06:51 +0200 |
| commit | ec3a39dc67e264eadb0b924dd7f872f566c8b2dc (patch) | |
| tree | 108f29b190519d6452fd2acf8e29bd331d52a384 /mysql-test/r/sp-error.result | |
| parent | 24f8b1cfa8798b11503b516da018140026895ce2 (diff) | |
| download | mariadb-git-ec3a39dc67e264eadb0b924dd7f872f566c8b2dc.tar.gz | |
Post-merge fixes.
mysql-test/r/sp-error.result:
Post-merge fixes. Error codes renumbered.
mysql-test/r/sp.result:
Post-merge fixes. Error codes renumbered.
mysql-test/r/variables.result:
Post-merge fixes. Error codes renumbered.
mysql-test/t/sp-error.test:
Post-merge fixes. Error codes renumbered.
mysql-test/t/sp.test:
Post-merge fixes. Error codes renumbered.
sql/item_subselect.cc:
Post-merge fixes. thd->lex is a pointer.
sql/slave.cc:
Post-merge fixes. Undid imported patch that's not 5.0 compatible.
sql/sql_parse.cc:
Post-merge fixes. Changed access API calls, and fixed merge error.
sql/sql_table.cc:
Post-merge fixes. No update log in 5.0.
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index ef8b2ac1552..4cd1c4c961c 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -35,7 +35,7 @@ call foo(); ERROR HY000: PROCEDURE foo does not exist drop procedure if exists foo; Warnings: -Warning 1281 PROCEDURE foo does not exist +Warning 1282 PROCEDURE foo does not exist create procedure foo() foo: loop leave bar; |