summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <svoj@poseidon.ndb.mysql.com>2005-11-06 16:16:18 +0100
committerunknown <svoj@poseidon.ndb.mysql.com>2005-11-06 16:16:18 +0100
commitdf33aacd87ff08c27fd371a0bb348fe3986e6f95 (patch)
tree0c9f1805d1951780ff34fb797c8fec0193020aab /mysql-test/t
parent2bddb0766473270f43e70bed16f3223255fee4a9 (diff)
parent3e5508909f7b7bebabfca5711e5778927279be19 (diff)
downloadmariadb-git-df33aacd87ff08c27fd371a0bb348fe3986e6f95.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/system_mysql_db_fix.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test
index 4621b2f50ef..0a93ad4a690 100644
--- a/mysql-test/t/system_mysql_db_fix.test
+++ b/mysql-test/t/system_mysql_db_fix.test
@@ -85,7 +85,7 @@ INSERT INTO user VALUES ('localhost','', '','N','N','N','N','N','N','N','N','
-- disable_query_log
-DROP TABLE db, host, user, func, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type;
-- enable_query_log