diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /mysql-test/r/ps_1general.result | |
| parent | 915a624cbcb58a10a2cfb2e2e4fd5029191fa86a (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-29f0dcb56337a3e352ad7a70dcff6b25bb605325.tar.gz | |
Merge MySQL->MariaDB
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 1ab2ef436d8..8d578794d6d 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -400,16 +400,16 @@ prepare stmt3 from ' lock tables t1 read ' ; ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt3 from ' unlock tables ' ; ERROR HY000: This command is not supported in the prepared statement protocol yet -prepare stmt1 from ' load data infile ''data.txt'' -into table t1 fields terminated by ''\t'' '; +prepare stmt1 from ' load data infile ''<MYSQLTEST_VARDIR>/tmp/data.txt'' + into table t1 fields terminated by ''\t'' '; ERROR HY000: This command is not supported in the prepared statement protocol yet -prepare stmt1 from ' select * into outfile ''data.txt'' from t1 '; +prepare stmt1 from ' select * into outfile ''<MYSQLTEST_VARDIR>/tmp/data.txt'' from t1 '; execute stmt1 ; prepare stmt1 from ' optimize table t1 ' ; prepare stmt1 from ' analyze table t1 ' ; prepare stmt1 from ' checksum table t1 ' ; prepare stmt1 from ' repair table t1 ' ; -prepare stmt1 from ' restore table t1 from ''data.txt'' ' ; +prepare stmt1 from ' restore table t1 from ''<MYSQLTEST_VARDIR>/tmp/data.txt'' ' ; ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt1 from ' handler t1 open '; ERROR HY000: This command is not supported in the prepared statement protocol yet |