bzr push into mysql-5.4.3-trunk branch (alik:2880 to 2882)

[Alexander Nozdrin]

 2882 Alexander Nozdrin	2009-09-18 [merge]
      Merge 5.1-bugteam -> trunk-alik (up to revno:3111).

    modified:
      mysql-test/r/trigger_notembedded.result
      mysql-test/t/myisam-system.test
      sql/sql_db.cc
 2881 Alexander Nozdrin	2009-09-18 [merge]
      Null-merge 5.1-bugteam revno:3110 (fix for Bug#44030).
      After discussion with Satya this bug does not exist
      in trunk.

 2880 Alexander Nozdrin	2009-09-17 [merge]
      Merge 5.1-bugteam -> trunk-alik.

    modified:
      mysys/mf_keycache.c
=== modified file 'mysql-test/r/trigger_notembedded.result'
--- a/mysql-test/r/trigger_notembedded.result	2009-06-25 10:52:50 +0000
+++ b/mysql-test/r/trigger_notembedded.result	2009-09-17 11:33:23 +0000
@@ -180,8 +180,6 @@ NULL	mysqltest_db1	trg5	DELETE	NULL	mysq
 DROP USER mysqltest_dfn@localhost;
 DROP USER mysqltest_inv@localhost;
 DROP DATABASE mysqltest_db1;
-Warnings:
-Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger.
 DELETE FROM mysql.user WHERE User LIKE 'mysqltest_%';
 DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%';
 DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%';

=== modified file 'mysql-test/t/myisam-system.test'
--- a/mysql-test/t/myisam-system.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/t/myisam-system.test	2009-09-17 11:33:23 +0000
@@ -12,11 +12,11 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 drop table if exists t1;
 create table t1 (a int) engine=myisam;
 --remove_file $MYSQLD_DATADIR/test/t1.MYI
---error 1051,6
+--error ER_BAD_TABLE_ERROR,6
 drop table t1;
 create table t1 (a int) engine=myisam;
 --remove_file $MYSQLD_DATADIR/test/t1.MYD
---error 1105,6,29
+--error ER_BAD_TABLE_ERROR,6,29
 drop table t1;
---error 1051
+--error ER_BAD_TABLE_ERROR
 drop table t1;

=== modified file 'sql/sql_db.cc'
--- a/sql/sql_db.cc	2009-08-13 02:48:57 +0000
+++ b/sql/sql_db.cc	2009-09-17 11:33:23 +0000
@@ -907,6 +907,9 @@ bool mysql_rm_db(THD *thd,char *db,bool 
     remove_db_from_cache(db);
     pthread_mutex_unlock(&LOCK_open);
 
+    Drop_table_error_handler err_handler(thd->get_internal_handler());
+    thd->push_internal_handler(&err_handler);
+
     error= -1;
     /*
       We temporarily disable the binary log while dropping the objects
@@ -939,6 +942,7 @@ bool mysql_rm_db(THD *thd,char *db,bool 
       error = 0;
       reenable_binlog(thd);
     }
+    thd->pop_internal_handler();
   }
   if (!silent && deleted>=0)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]