bzr push into mysql-6.0 branch (kgeorge:2822)

[Georgi Kodinov]

 2822 Georgi Kodinov	2008-09-03 [merge]
      merge 6.0-bugteam -> local tree
modified:
  sql/handler.cc

=== modified file 'mysql-test/t/events_grant.test'
--- a/mysql-test/t/events_grant.test	2007-05-26 14:36:38 +0000
+++ b/mysql-test/t/events_grant.test	2008-08-28 10:40:34 +0000
@@ -1,7 +1,9 @@
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc
 
+--disable_warnings
 CREATE DATABASE IF NOT EXISTS events_test;
+--enabled_warnings
 use events_test;
 #
 # Events grants test begin