diff options
author | unknown <andrey@example.com> | 2006-08-15 00:50:26 +0200 |
---|---|---|
committer | unknown <andrey@example.com> | 2006-08-15 00:50:26 +0200 |
commit | e5a2cb50fa8febed0b6ecd537d3edc63d80e9dce (patch) | |
tree | cbc2946d31361b5a834e935756e3f2c0ee271e9b /mysql-test/t/events_bugs.test | |
parent | b68723a10190e4b7028e9a671fad538875867d90 (diff) | |
download | mariadb-git-e5a2cb50fa8febed0b6ecd537d3edc63d80e9dce.tar.gz |
post-merge and testing fixes
mysql-test/r/events_bugs.result:
update results after merge
mysql-test/t/events.test:
num to name
mysql-test/t/events_bugs.test:
num to name
sql/sql_yacc.yy:
post-merge fixes regarding init_sp_name
put back code which I unintentionally removed during merg
sql/share/errmsg.txt:
add the message back
Diffstat (limited to 'mysql-test/t/events_bugs.test')
-rw-r--r-- | mysql-test/t/events_bugs.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index 692e85255ef..1fcf527c2fc 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -30,7 +30,7 @@ SET NAMES latin1; # START - BUG#16408: Events: crash for an event in a procedure # set @a=3; ---error 1562 +--error ER_EVENT_RECURSIVITY_FORBIDDEN CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5; # # END - BUG#16408: Events: crash for an event in a procedure |