diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
| commit | 1ef07d0845300ad200671f9809dcd9ee8b2ff837 (patch) | |
| tree | 5c22187a94c73c7f8099a5d366ab3fd425f8e578 /mysql-test/suite/funcs_1/r/is_table_constraints.result | |
| parent | 421bbdcf1004806ccbee7b45d55e90ddc15c76ae (diff) | |
| parent | f853333e09b222f6d6d76d9343b6202b4769ffab (diff) | |
| download | mariadb-git-1ef07d0845300ad200671f9809dcd9ee8b2ff837.tar.gz | |
Merge 10.0-base -> 10.0.
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_table_constraints.result')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_table_constraints.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index 65d1aa134db..cf0fce25e4c 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -57,6 +57,7 @@ table_schema, table_name FROM information_schema.table_constraints WHERE constraint_catalog IS NOT NULL; constraint_catalog constraint_schema constraint_name table_schema table_name +def mysql PRIMARY mysql column_stats def mysql PRIMARY mysql columns_priv def mysql PRIMARY mysql db def mysql PRIMARY mysql event @@ -69,6 +70,7 @@ def mysql PRIMARY mysql help_relation def mysql PRIMARY mysql help_topic def mysql name mysql help_topic def mysql PRIMARY mysql host +def mysql PRIMARY mysql index_stats def mysql PRIMARY mysql innodb_index_stats def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats def mysql PRIMARY mysql innodb_table_stats @@ -81,6 +83,7 @@ def mysql PRIMARY mysql servers def mysql PRIMARY mysql slave_master_info def mysql PRIMARY mysql slave_relay_log_info def mysql PRIMARY mysql slave_worker_info +def mysql PRIMARY mysql table_stats def mysql PRIMARY mysql tables_priv def mysql PRIMARY mysql time_zone def mysql PRIMARY mysql time_zone_leap_second |