update tests

mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test (bk mangles cp1251 during merge)
mysql-test/t/events_scheduling.test:
  fix test

3 files changed, 10 insertions, 9 deletions

diff --git a/mysql-test/r/events.result b/mysql-test/r/events.result
index 5ff26d7428d..01d206be7cb 100644
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events.result
@@ -262,10 +262,11 @@ ALTER TABLE mysql.event MODIFY db char(64) character set utf8 collate utf8_bin d
 "This should work"
 SHOW EVENTS;
 Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status
-events_test                                                 	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED
+events_test	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED
+ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';
+SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;
+ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.
 ALTER TABLE mysql.event MODIFY db varchar(64) character set utf8 collate utf8_bin default '';
-Warnings:
-Warning	1265	Data truncated for column 'db' at row 1
 SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;
 ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.
 ALTER TABLE mysql.event DROP comment, DROP starts;
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index 73cadd406d8..f80297682b7 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -147,8 +147,8 @@ SHOW CREATE EVENT root19;
 create event root20 on schedule every '50:20:12:45' day_second do select 1;
 SHOW CREATE EVENT root20;
 set names cp1251;
-create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1;
-SHOW CREATE EVENT ðóóò21;
+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 1235
 show create event root22;
@@ -173,7 +173,7 @@ drop event root17_1;
 drop event root18;
 drop event root19;
 drop event root20;
-drop event ðóóò21;
+drop event ðóóò21;
 
 set names latin1;
 #
@@ -202,7 +202,7 @@ INSERT INTO event_like SELECT * FROM mysql.event;
 #sleep a bit or we won't catch the change of time
 --sleep 1
 ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';
---error 1526
+--error ER_CANNOT_LOAD_FROM_TABLE
 SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;
 ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin default '';
 #wait a bit or we won't see the difference because of seconds resolution
diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
index 41bbb1da3c0..f83d919515b 100644
--- a/mysql-test/t/events_scheduling.test
+++ b/mysql-test/t/events_scheduling.test
@@ -24,10 +24,10 @@ SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') FROM INFORMATION_
 SELECT IF(LAST_EXECUTED-ENDS < 2, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;
 DROP EVENT start_n_end;
 --echo "Already dropped because ended. Therefore an error."
---error 1517
+--error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT only_one_time;
 --echo "Already dropped because ended. Therefore an error."
---error 1517
+--error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT two_time;
 DROP TABLE table_1;
 DROP TABLE table_2;