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/r/1st.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/r/1st.result')
-rw-r--r-- | mysql-test/r/1st.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result index f8e4754f861..7a68552b323 100644 --- a/mysql-test/r/1st.result +++ b/mysql-test/r/1st.result @@ -7,6 +7,7 @@ performance_schema test show tables in mysql; Tables_in_mysql +column_stats columns_priv db event @@ -17,6 +18,7 @@ help_keyword help_relation help_topic host +index_stats innodb_index_stats innodb_table_stats ndb_binlog_index @@ -29,6 +31,7 @@ slave_master_info slave_relay_log_info slave_worker_info slow_log +table_stats tables_priv time_zone time_zone_leap_second |