summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@bar.intranet.mysql.r18.ru>2004-03-30 22:18:49 +0500
committerunknown <bar@bar.intranet.mysql.r18.ru>2004-03-30 22:18:49 +0500
commit6b8d6d2a43beca924e655cdd071022860f4288a3 (patch)
tree62f884fec7065b163344f180ab61f36cb73d4e08 /mysql-test
parentacd4d158cc0706ec9502a7063079802c48c673b0 (diff)
downloadmariadb-git-6b8d6d2a43beca924e655cdd071022860f4288a3.tar.gz
ALTER TABLE t1 CONVERT TO should also change the default character set.
Forgot to do it in the previous commit.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/alter_table.result2
-rw-r--r--mysql-test/t/alter_table.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 5166e3bf8cb..a7c1dbde697 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -360,7 +360,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) character set koi8r default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
-alter table t1 CONVERT TO CHARACTER SET latin1, DEFAULT CHARACTER SET latin1;
+alter table t1 CONVERT TO CHARACTER SET latin1;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 658796e4a85..32654bb0bc4 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -214,7 +214,7 @@ select a,hex(a) from t1;
show create table t1;
alter table t1 DEFAULT CHARACTER SET latin1;
show create table t1;
-alter table t1 CONVERT TO CHARACTER SET latin1, DEFAULT CHARACTER SET latin1;
+alter table t1 CONVERT TO CHARACTER SET latin1;
show create table t1;
alter table t1 DEFAULT CHARACTER SET cp1251;
show create table t1;