summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-12-11 21:37:33 +0100
committerunknown <istruewing@stella.local>2007-12-11 21:37:33 +0100
commit19c7e2c9d5581aab49b0d3285f4831daad435154 (patch)
tree8d165ae75cc77a6c917c8dc41b75cb2ceb402ca8 /mysql-test/include
parentebc227bfa46dbec2d3a8f47d57d33120cd1c4a64 (diff)
parent2bbf12c3305295b41639c98ca805437b4efc0e3a (diff)
downloadmariadb-git-19c7e2c9d5581aab49b0d3285f4831daad435154.tar.gz
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/disabled.def: Auto merged sql/partition_info.cc: Auto merged storage/csv/ha_tina.cc: Auto merged mysql-test/r/func_misc.result: SCCS merged mysql-test/t/func_misc.test: SCCS merged
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/ctype_common.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/ctype_common.inc b/mysql-test/include/ctype_common.inc
index 9ee0a40c8ce..89b7ceb0c72 100644
--- a/mysql-test/include/ctype_common.inc
+++ b/mysql-test/include/ctype_common.inc
@@ -53,11 +53,13 @@ DROP TABLE t1;
#
# Bug #31070: crash during conversion of charsets
+# Bug #32726: crash with cast in order by clause and cp932 charset
#
create table t1 (a set('a') not null);
insert into t1 values (),();
select cast(a as char(1)) from t1;
select a sounds like a from t1;
+select 1 from t1 order by cast(a as char(1));
drop table t1;
DROP DATABASE d1;