bk commit into 5.0 tree (andrey:1.2335)

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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-11-16 13:46:43+01:00, andrey@stripped +3 -0
  Merge example.com:/work/bug24219/my41
  into  example.com:/work/bug24219/my50
  MERGE: 1.1616.2697.89

  mysql-test/r/alter_table.result@stripped, 2006-11-16 13:46:39+01:00, andrey@stripped +21 -21
    manual merge
    MERGE: 1.40.1.10

  mysql-test/t/alter_table.test@stripped, 2006-11-16 13:45:38+01:00, andrey@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.11

  sql/sql_table.cc@stripped, 2006-11-16 13:46:23+01:00, andrey@stripped +20 -30
    manual merge
    MERGE: 1.157.2.153

# 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:	andrey
# Host:	example.com
# Root:	/work/bug24219/my50/RESYNC

--- 1.56/mysql-test/r/alter_table.result	2006-11-16 13:46:53 +01:00
+++ 1.57/mysql-test/r/alter_table.result	2006-11-16 13:46:53 +01:00
@@ -428,42 +428,42 @@ t1	MyISAM	10	Fixed	1	37	X	X	X	X	X	X	X	X	
 drop table t1;
 set names koi8r;
 create table t1 (a char(10) character set koi8r);
+insert into t1 values ('ÔÅÓÔ');
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	D4C5D3D4
 alter table t1 change a a char(10) character set cp1251;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	F2E5F1F2
 alter table t1 change a a binary(4);
 select a,hex(a) from t1;
 a	hex(a)
+òåñò	F2E5F1F2
 alter table t1 change a a char(10) character set cp1251;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	F2E5F1F2
 alter table t1 change a a char(10) character set koi8r;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	D4C5D3D4
 alter table t1 change a a varchar(10) character set cp1251;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	F2E5F1F2
 alter table t1 change a a char(10) character set koi8r;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	D4C5D3D4
 alter table t1 change a a text character set cp1251;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	F2E5F1F2
 alter table t1 change a a char(10) character set koi8r;
 select a,hex(a) from t1;
 a	hex(a)
+ÔÅÓÔ	D4C5D3D4
 delete from t1;
 show create table t1;
 Table	Create Table
@@ -528,7 +528,7 @@ ALTER TABLE T12207 DISCARD TABLESPACE;
 ERROR HY000: Table storage engine for 'T12207' doesn't have this option
 DROP TABLE T12207;
 create table t1 (a text) character set koi8r;
+insert into t1 values (_koi8r'ÔÅÓÔ');
 select hex(a) from t1;
 hex(a)
 D4C5D3D4
@@ -566,3 +566,14 @@ create table t1 (t varchar(255) default 
 engine=myisam default charset=latin1;
 alter table t1 change t t text;
 drop table t1;
+DROP TABLE IF EXISTS bug24219;
+DROP TABLE IF EXISTS bug24219_2;
+CREATE TABLE bug24219 (a INT, INDEX(a));
+SHOW INDEX FROM bug24219;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+bug24219	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+ALTER TABLE bug24219 RENAME TO bug24219_2, DISABLE KEYS;
+SHOW INDEX FROM bug24219_2;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+bug24219_2	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	disabled
+DROP TABLE bug24219_2;

--- 1.44/mysql-test/t/alter_table.test	2006-11-16 13:46:53 +01:00
+++ 1.45/mysql-test/t/alter_table.test	2006-11-16 13:46:53 +01:00
@@ -402,6 +402,24 @@ alter table test.t1 rename test.t1;
 use test;
 drop table t1;
 
+#
+# Bug#24219 - ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
+#
+--disable_warnings
+DROP TABLE IF EXISTS bug24219;
+DROP TABLE IF EXISTS bug24219_2;
+--enable_warnings
+
+CREATE TABLE bug24219 (a INT, INDEX(a));
+
+SHOW INDEX FROM bug24219;
+
+ALTER TABLE bug24219 RENAME TO bug24219_2, DISABLE KEYS;
+
+SHOW INDEX FROM bug24219_2;
+
+DROP TABLE bug24219_2;
+
 # End of 4.1 tests
 
 #