diff options
| author | bar@mysql.com <> | 2005-08-29 15:44:49 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-08-29 15:44:49 +0500 |
| commit | be470c38c65047aca1019f99e442f56cfe7c37ac (patch) | |
| tree | 0365c0be8d68cb9bd70c0d40050c324a1771c1dd /mysql-test | |
| parent | 88af3ceb2009a2d735ff3ae90abd5ae0b84bb6c0 (diff) | |
| parent | 8d5bfbfa1e1c416d445fa3d2a47f7404930c42f5 (diff) | |
| download | mariadb-git-be470c38c65047aca1019f99e442f56cfe7c37ac.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12371
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_utf8.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/ctype_utf8.test | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index bb3222ca98b..a98beb36ef1 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -993,6 +993,15 @@ select * from t1 where a like "%abc\d%"; a abcd drop table t1; +set names utf8; +create table t1 (a char(3), b varchar(10)); +insert into t1 values ('bar','kostja'); +prepare my_stmt from "select * from t1 where a=?"; +set @a:='bar'; +execute my_stmt using @a; +a b +bar kostja +drop table t1; CREATE TABLE t1 ( a varchar(255) NOT NULL default '', KEY a (a) diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test index a09618df7c0..ede9665941a 100644 --- a/mysql-test/t/ctype_utf8.test +++ b/mysql-test/t/ctype_utf8.test @@ -832,6 +832,18 @@ drop table t1; # +# Bug #12371 executing prepared statement fails (illegal mix of collations) +# +set names utf8; +create table t1 (a char(3), b varchar(10)); +insert into t1 values ('bar','kostja'); +prepare my_stmt from "select * from t1 where a=?"; +set @a:='bar'; +execute my_stmt using @a; +drop table t1; + + +# # Bug#9557 MyISAM utf8 table crash # CREATE TABLE t1 ( |