bk commit into 5.1 tree (svoj:1.2359)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-13 17:32:40+04:00, svoj@april.(none) +3 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
  MERGE: 1.1810.2362.24

  mysql-test/r/alter_table.result@stripped, 2006-12-13 17:32:35+04:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.49.1.11

  mysql-test/t/alter_table.test@stripped, 2006-12-13 17:32:35+04:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.36.1.11

  sql/sql_parse.cc@stripped, 2006-12-13 17:32:35+04:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.426.1.170

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines/RESYNC

--- 1.611/sql/sql_parse.cc	2006-12-13 17:32:48 +04:00
+++ 1.612/sql/sql_parse.cc	2006-12-13 17:32:49 +04:00
@@ -7307,6 +7307,7 @@ bool mysql_create_index(THD *thd, TABLE_
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type= 0;
   create_info.default_table_charset= thd->variables.collation_database;
+  create_info.row_type= ROW_TYPE_NOT_USED;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name,
 				&create_info, table_list,
 				fields, keys, 0, (ORDER*)0,
@@ -7323,6 +7324,7 @@ bool mysql_drop_index(THD *thd, TABLE_LI
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type= 0;
   create_info.default_table_charset= thd->variables.collation_database;
+  create_info.row_type= ROW_TYPE_NOT_USED;
   alter_info->clear();
   alter_info->flags= ALTER_DROP_INDEX;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name,

--- 1.69/mysql-test/r/alter_table.result	2006-12-13 17:32:49 +04:00
+++ 1.70/mysql-test/r/alter_table.result	2006-12-13 17:32:49 +04:00
@@ -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));

--- 1.55/mysql-test/t/alter_table.test	2006-12-13 17:32:49 +04:00
+++ 1.56/mysql-test/t/alter_table.test	2006-12-13 17:32:49 +04:00
@@ -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