Commit b9d2627c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
parents 885de571 a4ad07b7

mysql-test/r/alter_table.result

+15 −0
Original line number Diff line number Diff line
@@ -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));

mysql-test/t/alter_table.test

+11 −0
Original line number Diff line number Diff line
@@ -499,6 +499,17 @@ alter table test.t1 rename test.t1; 
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

#

sql/sql_parse.cc

+2 −0
Original line number Diff line number Diff line
@@ -7039,6 +7039,7 @@ bool mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys) 
  bzero((char*) &create_info,sizeof(create_info));

  create_info.db_type=DB_TYPE_DEFAULT;

  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,
@@ -7055,6 +7056,7 @@ bool mysql_drop_index(THD *thd, TABLE_LIST *table_list, ALTER_INFO *alter_info) 
  bzero((char*) &create_info,sizeof(create_info));

  create_info.db_type=DB_TYPE_DEFAULT;

  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,