diff options
| author | unknown <konstantin@mysql.com> | 2005-07-13 23:49:45 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-13 23:49:45 +0400 |
| commit | 33be72238431691694f4600acf705cba0e424e74 (patch) | |
| tree | 3e265a285c2d54f0456bc427c1ecefe755ffbfe3 /mysql-test/r/ps.result | |
| parent | a8f13702793be392a2df02d7121036d3d0c4949f (diff) | |
| parent | 346dfa006abbeb48bdf865c4129fdaf74a9c9c31 (diff) | |
| download | mariadb-git-33be72238431691694f4600acf705cba0e424e74.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-9379
into mysql.com:/opt/local/work/mysql-5.0-root
sql/item.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/item_func.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index d2b7ef090fc..09d6e4e5381 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -740,3 +740,22 @@ execute stmt using @user_id, @id; partner_id deallocate prepare stmt; drop table t1, t2, t3, t4; +prepare stmt from 'select ?=?'; +set @a='CHRISTINE '; +set @b='CHRISTINE'; +execute stmt using @a, @b; +?=? +1 +execute stmt using @a, @b; +?=? +1 +set @a=1, @b=2; +execute stmt using @a, @b; +?=? +0 +set @a='CHRISTINE '; +set @b='CHRISTINE'; +execute stmt using @a, @b; +?=? +1 +deallocate prepare stmt; |