summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormikael@dator5.(none) <>2006-06-20 15:13:44 -0400
committermikael@dator5.(none) <>2006-06-20 15:13:44 -0400
commit39b9c16e1ab2ef1b2cb5839a1acb729b1c421cd8 (patch)
tree466a850c17d713549e1d1a16c02210bcdeb026fd /mysql-test
parent1c42c9730d8edb44b8f93c735a82dbbed121af7f (diff)
parent9a34f6199b184bf43f67cd7f7ef810ae8dc7df49 (diff)
downloadmariadb-git-39b9c16e1ab2ef1b2cb5839a1acb729b1c421cd8.tar.gz
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug19309
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/partition.result7
-rw-r--r--mysql-test/t/partition.test24
2 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index fa1baaec07e..63abaf6eda4 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1,4 +1,11 @@
drop table if exists t1;
+create table t1 (a int)
+partition by list (a)
+(partition p0 values in (1));
+create procedure pz()
+alter table t1 engine = myisam;
+call pz();
+call pz();
create table t1 (a bigint)
partition by range (a)
(partition p0 values less than (0xFFFFFFFFFFFFFFFF),
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index f62bb2dcd01..7ef5f66cd9e 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -10,6 +10,30 @@ drop table if exists t1;
--enable_warnings
#
+# Bug 19309 Partitions: Crash if double procedural alter
+#
+create table t1 (a int)
+partition by list (a)
+(partition p0 values in (1));
+
+create procedure pz()
+alter table t1 engine = myisam;
+
+call pz();
+call pz();
+drop procedure pz;
+drop table t1;
+
+#
+# Bug 19307: CSV engine crashes
+#
+--error ER_PARTITION_MERGE_ERROR
+create table t1 (a int)
+engine = csv
+partition by list (a)
+(partition p0 values in (null));
+
+#
# BUG 16002: Handle unsigned integer functions properly
#
--error 1064