Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

into  dl145s.mysql.com:/data0/mhansson/my51-bug30234

mysql-test/r/information_schema.result

@@ -1618,4 +1618,5 @@ show events from information_schema;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 show events where Db= 'information_schema';
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+use test;
 End of 5.1 tests.

mysql-test/t/information_schema.test

@@ -1245,5 +1245,6 @@ use information_schema;
 show events;
 show events from information_schema;
 show events where Db= 'information_schema';
+use test;
 
 --echo End of 5.1 tests.