summaryrefslogtreecommitdiff
path: root/mysql-test/t/events.test
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-02-14 20:27:42 +0100
committerunknown <andrey@lmy004.>2006-02-14 20:27:42 +0100
commitee1b893f99eeb3e90b18da88e32c8c5a16eab69d (patch)
treebad0e02d5f9b407a4dd6b5ed526891a23f4f828b /mysql-test/t/events.test
parent1161b5213d454b3e4bca697a52b6df6222696151 (diff)
parent99526f2efb29a7573ed1b4f820c9b2f4cc32753c (diff)
downloadmariadb-git-ee1b893f99eeb3e90b18da88e32c8c5a16eab69d.tar.gz
manual merge
mysql-test/t/events.test: Auto merged
Diffstat (limited to 'mysql-test/t/events.test')
-rw-r--r--mysql-test/t/events.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index 9c084bc6522..b6276007a58 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -111,9 +111,9 @@ set names cp1251;
create event руут21 on schedule every '50:23:59:95' day_second COMMENT 'това е 1251 коментар' do select 1;
SHOW CREATE EVENT руут21;
insert into mysql.event (db, name, body, definer, interval_value, interval_field) values (database(), "root22", "select 1", user(), 100, "SECOND_MICROSECOND");
---error 1535
+--error 1235
show create event root22;
---error 1535
+--error 1235
SHOW EVENTS;
drop event root22;
drop event root6;