diff options
| author | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
|---|---|---|
| committer | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
| commit | df33aacd87ff08c27fd371a0bb348fe3986e6f95 (patch) | |
| tree | 0c9f1805d1951780ff34fb797c8fec0193020aab /mysql-test | |
| parent | 2bddb0766473270f43e70bed16f3223255fee4a9 (diff) | |
| parent | 3e5508909f7b7bebabfca5711e5778927279be19 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | mysql-test/r/connect.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/information_schema.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix.test | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index d5b1cf4dd63..99650f6b220 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -9,6 +9,7 @@ help_keyword help_relation help_topic host +plugin proc procs_priv tables_priv @@ -36,6 +37,7 @@ help_keyword help_relation help_topic host +plugin proc procs_priv tables_priv @@ -71,6 +73,7 @@ help_keyword help_relation help_topic host +plugin proc procs_priv tables_priv diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index a5852dc31b4..d013de58a88 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -60,6 +60,7 @@ help_keyword help_relation help_topic host +plugin proc procs_priv tables_priv @@ -709,7 +710,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; count(*) -101 +102 drop view a2, a1; drop table t_crashme; select table_schema,table_name, column_name from @@ -779,7 +780,7 @@ flush privileges; SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; table_schema count(*) information_schema 16 -mysql 17 +mysql 18 create table t1 (i int, j int); create trigger trg1 before insert on t1 for each row begin diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 8c98e18aa9b..b2202ff10d0 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -6,6 +6,7 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.tables_priv OK @@ -23,6 +24,7 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.tables_priv OK diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 999f12a0573..706165fef8a 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -9,6 +9,7 @@ help_keyword help_relation help_topic host +plugin proc procs_priv tables_priv 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 |