diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 21:55:12 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 21:55:12 +0200 |
commit | a15ac50637254bc0b984a101ff19f7fce5406602 (patch) | |
tree | 1dae947e072d55116c0bdbea78fcba6e97293c50 /mysql-test/t/ps_1general.test | |
parent | 97d8da57a3d2618ca9926a3a3127a4c9ba3bb268 (diff) | |
parent | 462a43e16b5bb2307effe44d18cdb82fef1ff170 (diff) | |
download | mariadb-git-a15ac50637254bc0b984a101ff19f7fce5406602.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
-rw-r--r-- | mysql-test/t/ps_1general.test | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 6b168711de8..f61a7820afe 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -456,13 +456,10 @@ into table t1 fields terminated by ''\t'' '; prepare stmt1 from ' select * into outfile ''data.txt'' from t1 '; execute stmt1 ; ## ---error 1295 prepare stmt1 from ' optimize table t1 ' ; ---error 1295 prepare stmt1 from ' analyze table t1 ' ; --error 1295 prepare stmt1 from ' checksum table t1 ' ; ---error 1295 prepare stmt1 from ' repair table t1 ' ; --error 1295 prepare stmt1 from ' restore table t1 from ''data.txt'' ' ; |