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.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.test')
| -rw-r--r-- | mysql-test/t/events.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test index 2a27144bc27..161f4c1aefe 100644 --- a/mysql-test/t/events.test +++ b/mysql-test/t/events.test @@ -83,7 +83,7 @@ DROP EVENT event_starts_test; # create table test_nested(a int); create event e_43 on schedule every 1 second do set @a = 5; ---error 1562 +--error ER_EVENT_RECURSIVITY_FORBIDDEN alter event e_43 do alter event e_43 do set @a = 4; delimiter |; alter event e_43 do @@ -339,7 +339,7 @@ drop event закачка21; # Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement # create table t_16 (s1 int); ---error 1562 +--error ER_EVENT_RECURSIVITY_FORBIDDEN create trigger t_16_bi before insert on t_16 for each row create event e_16 on schedule every 1 second do set @a=5; drop table t_16; # |