summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition.test
diff options
context:
space:
mode:
authorunknown <mikael/pappa@dator5.(none)>2006-08-22 16:52:25 -0400
committerunknown <mikael/pappa@dator5.(none)>2006-08-22 16:52:25 -0400
commit13133087e4089fa4313b367eacaee73ae5e2369f (patch)
tree4a600a40e15e6a0e54ebfe5ea6674c156ab12890 /mysql-test/t/partition.test
parentf56dd7f9f826ea51314816150b3e6b7754f53ed1 (diff)
downloadmariadb-git-13133087e4089fa4313b367eacaee73ae5e2369f.tar.gz
BUG#21658: Crash when creating table with item in prepared statement that allocates memory in fix_fields
We need to use an arena to indicate we are preparing a statement when loading partition function and parsing it as part of an open table. mysql-test/r/partition.result: Moved test case mysql-test/t/partition.test: Moved test case sql/item.cc: Shouldn't call change_item_tree in prepare statement phase even if arena was already activated sql/sql_partition.cc: We need to use an arena to indicate we are preparing a statement when loading partition function and parsing it as part of an open table. sql/table.cc: We need to use an arena to indicate we are preparing a statement when loading partition function and parsing it as part of an open table.
Diffstat (limited to 'mysql-test/t/partition.test')
-rw-r--r--mysql-test/t/partition.test18
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 43e57221a42..75aceb4fafe 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -10,6 +10,15 @@ drop table if exists t1;
--enable_warnings
#
+# Bug#14367: Partitions: crash if utf8 column
+#
+create table t1 (s1 char(2) character set utf8)
+partition by list (case when s1 > 'cz' then 1 else 2 end)
+(partition p1 values in (1),
+ partition p2 values in (2));
+drop table t1;
+
+#
# Bug 15890: Strange number of partitions accepted
#
-- error 1064
@@ -940,15 +949,6 @@ show create table t2;
drop table t2;
#
-# Bug#14367: Partitions: crash if utf8 column
-#
-create table t1 (s1 char(2) character set utf8)
-partition by list (case when s1 > 'cz' then 1 else 2 end)
-(partition p1 values in (1),
- partition p2 values in (2));
-drop table t1;
-
-#
# Bug#15336 Partitions: crash if create table as select
#
create table t1 (f1 int) partition by hash (f1) as select 1;