summaryrefslogtreecommitdiff
path: root/mysql-test/r/1st.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-11-02 20:38:05 -0700
committerIgor Babaev <igor@askmonty.org>2012-11-02 20:38:05 -0700
commit8d612adf70c53dcb741b097133e09d176d0780e1 (patch)
tree278a83cc5caaccbfb408471cef6bde5e5171d802 /mysql-test/r/1st.result
parent4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff)
parent32443e744d354fbba93c8761486462b5820b74bb (diff)
downloadmariadb-git-8d612adf70c53dcb741b097133e09d176d0780e1.tar.gz
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'mysql-test/r/1st.result')
-rw-r--r--mysql-test/r/1st.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index 792d9eaf2f1..9c97cd3d2c3 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_stat
columns_priv
db
event
@@ -17,6 +18,7 @@ help_keyword
help_relation
help_topic
host
+index_stat
ndb_binlog_index
plugin
proc
@@ -24,6 +26,7 @@ procs_priv
proxies_priv
servers
slow_log
+table_stat
tables_priv
time_zone
time_zone_leap_second