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/connect.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/connect.result')
| -rw-r--r-- | mysql-test/r/connect.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index 2150df99030..ec9a5ffd1c1 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -1,6 +1,7 @@ drop table if exists t1,t2; show tables; Tables_in_mysql +column_stats columns_priv db event @@ -11,6 +12,7 @@ help_keyword help_relation help_topic host +index_stats innodb_index_stats innodb_table_stats ndb_binlog_index @@ -23,6 +25,7 @@ slave_master_info slave_relay_log_info slave_worker_info slow_log +table_stats tables_priv time_zone time_zone_leap_second @@ -40,6 +43,7 @@ grant ALL on *.* to test@localhost identified by "gambling"; grant ALL on *.* to test@127.0.0.1 identified by "gambling"; show tables; Tables_in_mysql +column_stats columns_priv db event @@ -50,6 +54,7 @@ help_keyword help_relation help_topic host +index_stats innodb_index_stats innodb_table_stats ndb_binlog_index @@ -62,6 +67,7 @@ slave_master_info slave_relay_log_info slave_worker_info slow_log +table_stats tables_priv time_zone time_zone_leap_second @@ -87,6 +93,7 @@ ERROR HY000: Password hash should be a 41-digit hexadecimal number set password=old_password('gambling3'); show tables; Tables_in_mysql +column_stats columns_priv db event @@ -97,6 +104,7 @@ help_keyword help_relation help_topic host +index_stats innodb_index_stats innodb_table_stats ndb_binlog_index @@ -109,6 +117,7 @@ slave_master_info slave_relay_log_info slave_worker_info slow_log +table_stats tables_priv time_zone time_zone_leap_second |