summaryrefslogtreecommitdiff
path: root/mysql-test/r/1st.result
diff options
context:
space:
mode:
authorpatg@govinda.patg.net <>2006-12-08 22:30:18 -0500
committerpatg@govinda.patg.net <>2006-12-08 22:30:18 -0500
commitf9097b86af657717280061400cbdec97f4a5fa65 (patch)
treed4e2024ed0a048aebabc053293f04f67c25d5a55 /mysql-test/r/1st.result
parent23f0c6d7658de7a5c465d7afb66ae2f87d8ea96a (diff)
parent98062f567d31516f61d720661f46ee447d66821d (diff)
downloadmariadb-git-f9097b86af657717280061400cbdec97f4a5fa65.tar.gz
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
Diffstat (limited to 'mysql-test/r/1st.result')
-rw-r--r--mysql-test/r/1st.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index 274a23cc48c..60190629dd0 100644
--- a/mysql-test/r/1st.result
+++ b/mysql-test/r/1st.result
@@ -19,6 +19,7 @@ ndb_binlog_index
plugin
proc
procs_priv
+servers
slow_log
tables_priv
time_zone