diff options
| author | unknown <konstantin@mysql.com> | 2005-07-15 02:13:08 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-15 02:13:08 +0400 |
| commit | 3357d89b3a66a831629a1d8b179693895df74675 (patch) | |
| tree | 01a2fb3be1db4ca590fbc86baac7e8a3982734e3 /mysql-test/t/ps.test | |
| parent | ef09588661c499f53cfd67b898c987e94615d5c9 (diff) | |
| parent | 951dacdcf17bcf875bf6c7559cfce578760b38d9 (diff) | |
| download | mariadb-git-3357d89b3a66a831629a1d8b179693895df74675.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/t/ps.test:
Manual merge
Diffstat (limited to 'mysql-test/t/ps.test')
| -rw-r--r-- | mysql-test/t/ps.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index f9b6d27bacc..fa5dd0680b5 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -815,10 +815,12 @@ prepare stmt from "select ?FROM t1"; prepare stmt from "select FROM t1 WHERE?=1"; --error 1064 prepare stmt from "update t1 set a=a+?WHERE 1"; +--disable_ps_protocol --error 1064 select ?; --error 1064 select ??; --error 1064 select ? from t1; +--enable_ps_protocol drop table t1; |