summaryrefslogtreecommitdiff
path: root/mysql-test/r/1st.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-03-19 01:35:32 -0700
committerIgor Babaev <igor@askmonty.org>2012-03-19 01:35:32 -0700
commitff3d16fba898efa68677f3b0049668a341f27a06 (patch)
treef56fddecdc49cf5ccd55680c14dc5b27371b2f03 /mysql-test/r/1st.result
parent51c77ec5d406843bb8c8131f0687f4f75839d045 (diff)
parent7b845f551b8f206c886366499e21b790991f5418 (diff)
downloadmariadb-git-ff3d16fba898efa68677f3b0049668a341f27a06.tar.gz
Merge maria-5.3-mwl248 -> 5.5 = maria-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