diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
commit | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (patch) | |
tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result | |
parent | 713ed2d2438dd0e5aecf8ea5138d0ca97c3bc519 (diff) | |
parent | 2757eab5444982e9375f77d9bca52992f55cc565 (diff) | |
download | mariadb-git-69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4.tar.gz |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result')
-rw-r--r-- | mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result index 6e31953d297..e0ea412e83a 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result @@ -7,59 +7,59 @@ SELECT * FROM information_schema.table_constraints WHERE table_schema = 'mysql' ORDER BY table_schema,table_name,constraint_name; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE -NULL mysql PRIMARY mysql columns_priv PRIMARY KEY -NULL mysql PRIMARY mysql db PRIMARY KEY -NULL mysql PRIMARY mysql event PRIMARY KEY -NULL mysql PRIMARY mysql func PRIMARY KEY -NULL mysql name mysql help_category UNIQUE -NULL mysql PRIMARY mysql help_category PRIMARY KEY -NULL mysql name mysql help_keyword UNIQUE -NULL mysql PRIMARY mysql help_keyword PRIMARY KEY -NULL mysql PRIMARY mysql help_relation PRIMARY KEY -NULL mysql name mysql help_topic UNIQUE -NULL mysql PRIMARY mysql help_topic PRIMARY KEY -NULL mysql PRIMARY mysql host PRIMARY KEY -NULL mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY -NULL mysql PRIMARY mysql plugin PRIMARY KEY -NULL mysql PRIMARY mysql proc PRIMARY KEY -NULL mysql PRIMARY mysql procs_priv PRIMARY KEY -NULL mysql PRIMARY mysql servers PRIMARY KEY -NULL mysql PRIMARY mysql tables_priv PRIMARY KEY -NULL mysql PRIMARY mysql time_zone PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_name PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_transition PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY -NULL mysql PRIMARY mysql user PRIMARY KEY +def mysql PRIMARY mysql columns_priv PRIMARY KEY +def mysql PRIMARY mysql db PRIMARY KEY +def mysql PRIMARY mysql event PRIMARY KEY +def mysql PRIMARY mysql func PRIMARY KEY +def mysql name mysql help_category UNIQUE +def mysql PRIMARY mysql help_category PRIMARY KEY +def mysql name mysql help_keyword UNIQUE +def mysql PRIMARY mysql help_keyword PRIMARY KEY +def mysql PRIMARY mysql help_relation PRIMARY KEY +def mysql name mysql help_topic UNIQUE +def mysql PRIMARY mysql help_topic PRIMARY KEY +def mysql PRIMARY mysql host PRIMARY KEY +def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY +def mysql PRIMARY mysql plugin PRIMARY KEY +def mysql PRIMARY mysql proc PRIMARY KEY +def mysql PRIMARY mysql procs_priv PRIMARY KEY +def mysql PRIMARY mysql servers PRIMARY KEY +def mysql PRIMARY mysql tables_priv PRIMARY KEY +def mysql PRIMARY mysql time_zone PRIMARY KEY +def mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY +def mysql PRIMARY mysql time_zone_name PRIMARY KEY +def mysql PRIMARY mysql time_zone_transition PRIMARY KEY +def mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY +def mysql PRIMARY mysql user PRIMARY KEY # Establish connection testuser1 (user=testuser1) SELECT * FROM information_schema.table_constraints WHERE table_schema = 'mysql' ORDER BY table_schema,table_name,constraint_name; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE -NULL mysql PRIMARY mysql columns_priv PRIMARY KEY -NULL mysql PRIMARY mysql db PRIMARY KEY -NULL mysql PRIMARY mysql event PRIMARY KEY -NULL mysql PRIMARY mysql func PRIMARY KEY -NULL mysql name mysql help_category UNIQUE -NULL mysql PRIMARY mysql help_category PRIMARY KEY -NULL mysql name mysql help_keyword UNIQUE -NULL mysql PRIMARY mysql help_keyword PRIMARY KEY -NULL mysql PRIMARY mysql help_relation PRIMARY KEY -NULL mysql name mysql help_topic UNIQUE -NULL mysql PRIMARY mysql help_topic PRIMARY KEY -NULL mysql PRIMARY mysql host PRIMARY KEY -NULL mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY -NULL mysql PRIMARY mysql plugin PRIMARY KEY -NULL mysql PRIMARY mysql proc PRIMARY KEY -NULL mysql PRIMARY mysql procs_priv PRIMARY KEY -NULL mysql PRIMARY mysql servers PRIMARY KEY -NULL mysql PRIMARY mysql tables_priv PRIMARY KEY -NULL mysql PRIMARY mysql time_zone PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_name PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_transition PRIMARY KEY -NULL mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY -NULL mysql PRIMARY mysql user PRIMARY KEY +def mysql PRIMARY mysql columns_priv PRIMARY KEY +def mysql PRIMARY mysql db PRIMARY KEY +def mysql PRIMARY mysql event PRIMARY KEY +def mysql PRIMARY mysql func PRIMARY KEY +def mysql name mysql help_category UNIQUE +def mysql PRIMARY mysql help_category PRIMARY KEY +def mysql name mysql help_keyword UNIQUE +def mysql PRIMARY mysql help_keyword PRIMARY KEY +def mysql PRIMARY mysql help_relation PRIMARY KEY +def mysql name mysql help_topic UNIQUE +def mysql PRIMARY mysql help_topic PRIMARY KEY +def mysql PRIMARY mysql host PRIMARY KEY +def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY +def mysql PRIMARY mysql plugin PRIMARY KEY +def mysql PRIMARY mysql proc PRIMARY KEY +def mysql PRIMARY mysql procs_priv PRIMARY KEY +def mysql PRIMARY mysql servers PRIMARY KEY +def mysql PRIMARY mysql tables_priv PRIMARY KEY +def mysql PRIMARY mysql time_zone PRIMARY KEY +def mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY +def mysql PRIMARY mysql time_zone_name PRIMARY KEY +def mysql PRIMARY mysql time_zone_transition PRIMARY KEY +def mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY +def mysql PRIMARY mysql user PRIMARY KEY # Switch to connection default and close connection testuser1 DROP USER testuser1@localhost; DROP DATABASE db_datadict; |