diff options
author | unknown <kent@mysql.com> | 2005-02-17 03:04:28 +0100 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-02-17 03:04:28 +0100 |
commit | a2d3bc8d759df5f8a655db94a9c71eedc786f68b (patch) | |
tree | f23d9521187fc8562d9af1208475081ac433d19b /mysql-test/t/ps_1general.test | |
parent | 1fbeaf710ab4e1b8f532e82c6d304dd1be59e614 (diff) | |
parent | 3f808996794b5ed83f646fd08946a5499bbb665c (diff) | |
download | mariadb-git-a2d3bc8d759df5f8a655db94a9c71eedc786f68b.tar.gz |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
mysql-test/t/ps_1general.test:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
-rw-r--r-- | mysql-test/t/ps_1general.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index aaff899bf82..81934547f82 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -606,6 +606,7 @@ drop table t2; prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; # rename must fail, t7 does not exist +--replace_result \\ / --error 1017 execute stmt1 ; create table t7 (a int) ; |