Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug16407

scripts/mysql_fix_privilege_tables.sql

@@ -665,5 +665,5 @@ ALTER TABLE event ADD sql_mode
                             'TRADITIONAL',
                             'NO_AUTO_CREATE_USER',
                             'HIGH_NOT_PRECEDENCE'
-                            ) DEFAULT '' NOT NULL;
+                            ) DEFAULT '' NOT NULL AFTER on_completion;