diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-01-11 21:39:45 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-01-11 21:39:45 +0400 |
| commit | d52a1a144bf382b21d868bed23dfddc00d0c619e (patch) | |
| tree | 5b163578c3488a623370fc611d065b79395e4370 /mysql-test/include | |
| parent | 8a757010d7aeab31835fdcbfaee179c1d04ccbee (diff) | |
| parent | a114ede24abff88609e5686f0eafbaf7fc2ed0b7 (diff) | |
| download | mariadb-git-d52a1a144bf382b21d868bed23dfddc00d0c619e.tar.gz | |
Merge host.loc:/home/uchum/work/5.1-opt-33699
into host.loc:/home/uchum/work/5.1-opt
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
Merge with local tree (bug#33699).
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
Merge with local tree (bug#33699).
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/ps_modify.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/ps_modify.inc b/mysql-test/include/ps_modify.inc index f66f888261d..4cde18b97d1 100644 --- a/mysql-test/include/ps_modify.inc +++ b/mysql-test/include/ps_modify.inc @@ -108,6 +108,7 @@ execute stmt1 using @arg00, @arg01; select a,b from t1 where a=@arg00; set @arg00=NULL; set @arg01=2; +--error 1048 execute stmt1 using @arg00, @arg01; select a,b from t1 order by a; set @arg00=0; |