summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <svoj@april.(none)>2006-12-13 17:32:40 +0400
committerunknown <svoj@april.(none)>2006-12-13 17:32:40 +0400
commit9e46434910977de19b808c3a802ede9961004714 (patch)
treee8eecc4a0ef60a1596baf9d7300490ae1cecfea2 /mysql-test
parentdc48dcb8537ff5f71750a7ba93e6de8cb591344e (diff)
parentb9d2627ca18bf31f1e5cd62a7a3b5c6e4ea79de9 (diff)
downloadmariadb-git-9e46434910977de19b808c3a802ede9961004714.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines mysql-test/r/alter_table.result: Auto merged mysql-test/t/alter_table.test: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/alter_table.result15
-rw-r--r--mysql-test/t/alter_table.test11
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index ebc8342c8ce..4476476f6b4 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -677,6 +677,21 @@ ERROR 3D000: No database selected
alter table test.t1 rename test.t1;
use test;
drop table t1;
+CREATE TABLE t1(a INT) ROW_FORMAT=FIXED;
+CREATE INDEX i1 ON t1(a);
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) default NULL,
+ KEY `i1` (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
+DROP INDEX i1 ON t1;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
+DROP TABLE t1;
DROP TABLE IF EXISTS bug24219;
DROP TABLE IF EXISTS bug24219_2;
CREATE TABLE bug24219 (a INT, INDEX(a));
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 6269ff38857..990f0f4adf5 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -500,6 +500,17 @@ use test;
drop table t1;
#
+# BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the
+# table
+#
+CREATE TABLE t1(a INT) ROW_FORMAT=FIXED;
+CREATE INDEX i1 ON t1(a);
+SHOW CREATE TABLE t1;
+DROP INDEX i1 ON t1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+#
# Bug#24219 - ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
#
--disable_warnings