diff options
| author | unknown <antony@ppcg5.local> | 2007-07-06 09:03:50 -0700 |
|---|---|---|
| committer | unknown <antony@ppcg5.local> | 2007-07-06 09:03:50 -0700 |
| commit | 09ee3a5ae114769a976767394a307eded76e790f (patch) | |
| tree | 66c5419689570123e5a89f3071167d75adc70483 /mysql-test/r/show_check.result | |
| parent | 48782e344c4410ad05ac0a2244aff7c943aa3c39 (diff) | |
| parent | bd087a17565e7077c182fbe1e905815cdcaed686 (diff) | |
| download | mariadb-git-09ee3a5ae114769a976767394a307eded76e790f.tar.gz | |
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
include/my_base.h:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_single_user.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 9ef10865cd7..895b8c2ae1b 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1168,7 +1168,7 @@ drop database mysqltest; show full plugin; show warnings; Level Code Message -Warning 1543 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead +Warning 1287 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead show plugin; show plugins; create database `mysqlttest\1`; |