summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2004-12-07 14:08:56 +0300
committerunknown <gluh@gluh.mysql.r18.ru>2004-12-07 14:08:56 +0300
commit9f48eedb4e2251dbc30019ad012cb808385072ab (patch)
treeebe503ca4c9de3f70a61ade4be4899055502aab2 /mysql-test
parent0d8d061f738925d3c9da3cc1804fae0eb91db243 (diff)
downloadmariadb-git-9f48eedb4e2251dbc30019ad012cb808385072ab.tar.gz
Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x'
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_enum.result8
-rw-r--r--mysql-test/t/type_enum.test15
2 files changed, 22 insertions, 1 deletions
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result
index 2ccf32367fb..e5239dcf769 100644
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/r/type_enum.result
@@ -1737,3 +1737,11 @@ def test t1 t1 c c 254 3 0 Y 384 0 8
a b c
Y NULL NULL
drop table t1;
+create table t1 (a enum('x','y') default 'x');
+alter table t1 alter a set default 'z';
+ERROR 42000: Invalid default value for 'a'
+drop table t1;
+create table t1 (a set('x','y') default 'x');
+alter table t1 alter a set default 'z';
+ERROR 42000: Invalid default value for 'a'
+drop table t1;
diff --git a/mysql-test/t/type_enum.test b/mysql-test/t/type_enum.test
index 3a5b12b91e4..6b2183df069 100644
--- a/mysql-test/t/type_enum.test
+++ b/mysql-test/t/type_enum.test
@@ -111,5 +111,18 @@ alter table t1 add b set ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;
alter table t1 add c enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;
--enable_metadata
select * from t1;
---disable metadata
+--disable_metadata
+drop table t1;
+
+#
+# Bug #6840 Default value is not checked in ALTER column SET DEFAULT 'x'
+#
+create table t1 (a enum('x','y') default 'x');
+--error 1067
+alter table t1 alter a set default 'z';
+drop table t1;
+
+create table t1 (a set('x','y') default 'x');
+--error 1067
+alter table t1 alter a set default 'z';
drop table t1;