diff options
| author | unknown <patg@govinda.patg.net> | 2006-12-08 22:30:18 -0500 |
|---|---|---|
| committer | unknown <patg@govinda.patg.net> | 2006-12-08 22:30:18 -0500 |
| commit | 00080b90f7dee841732c8e740c580bd35be7f963 (patch) | |
| tree | d4e2024ed0a048aebabc053293f04f67c25d5a55 /mysql-test/r/1st.result | |
| parent | 9e82f299e526ceafd0deb105f0487681406b1be8 (diff) | |
| parent | 715e63ae98d12d7b4121f3499739e9852a37907b (diff) | |
| download | mariadb-git-00080b90f7dee841732c8e740c580bd35be7f963.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
mysql-test/lib/init_db.sql:
Auto merged
mysql-test/r/1st.result:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
mysql-test/r/sp.result:
WL# 3031
More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
WL# 3031
More fun with error codes. These error codes vary in the result files because new error codes have been added
Diffstat (limited to 'mysql-test/r/1st.result')
| -rw-r--r-- | mysql-test/r/1st.result | 1 |
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 |