diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-31 16:47:18 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-31 16:47:18 +0400 |
| commit | e788274b7529aa7ccb69d91ac4ec0258e3e7dc63 (patch) | |
| tree | 8f8f46bf7a41b9abf4267c03005d609670a790b2 /mysql-test/t/ps_1general.test | |
| parent | 32b5759e8acf44e52ffb2559ea5af19891f29890 (diff) | |
| parent | e8040084a5363c49fc56d0a9db3ca2ed828a9e69 (diff) | |
| download | mariadb-git-e788274b7529aa7ccb69d91ac4ec0258e3e7dc63.tar.gz | |
Merge mysql.com:/home/hf/work/25973/my50-25973
into mysql.com:/home/hf/work/25973/my51-25973
mysql-test/t/ps_1general.test:
merging
Diffstat (limited to 'mysql-test/t/ps_1general.test')
| -rw-r--r-- | mysql-test/t/ps_1general.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index dd70f7edfa7..7a09bf88e3e 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -579,7 +579,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; # rename must fail, t7 does not exist # Clean up the filename here because embedded server reports whole path ---replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ "" t7.frm t7 +--replace_result \\ / $MYSQLTEST_VARDIR . /master-data/ / t7.frm t7 --error 1017 execute stmt1 ; create table t7 (a int) ; |