Commit db42257d authored by unknown's avatar unknown
Browse files

Merge example.com:/work/bug24219/my41 

into  example.com:/work/bug24219/my50


mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  manual merge
mysql-test/r/alter_table.result:
  manual merge
parents 574902e3 09fc514b

mysql-test/r/alter_table.result

+22 −11
Original line number Diff line number Diff line
@@ -428,42 +428,42 @@ t1 MyISAM 10 Fixed 1 37 X X X X X X X X latin1_swedish_ci NULL 
drop table t1;

set names koi8r;

create table t1 (a char(10) character set koi8r);

insert into t1 values ('');

insert into t1 values ('ÔÅÓÔ');

select a,hex(a) from t1;

a	hex(a)

	D4C5D3D4

ÔÅÓÔ	D4C5D3D4

alter table t1 change a a char(10) character set cp1251;

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

ÔÅÓÔ	F2E5F1F2

alter table t1 change a a binary(4);

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

òåñò	F2E5F1F2

alter table t1 change a a char(10) character set cp1251;

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

ÔÅÓÔ	F2E5F1F2

alter table t1 change a a char(10) character set koi8r;

select a,hex(a) from t1;

a	hex(a)

	D4C5D3D4

ÔÅÓÔ	D4C5D3D4

alter table t1 change a a varchar(10) character set cp1251;

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

ÔÅÓÔ	F2E5F1F2

alter table t1 change a a char(10) character set koi8r;

select a,hex(a) from t1;

a	hex(a)

	D4C5D3D4

ÔÅÓÔ	D4C5D3D4

alter table t1 change a a text character set cp1251;

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

ÔÅÓÔ	F2E5F1F2

alter table t1 change a a char(10) character set koi8r;

select a,hex(a) from t1;

a	hex(a)

	D4C5D3D4

ÔÅÓÔ	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'');

insert into t1 values (_koi8r'ÔÅÓÔ');

select hex(a) from t1;

hex(a)

D4C5D3D4
@@ -566,3 +566,14 @@ create table t1 (t varchar(255) default null, key t (t(80))) 
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;

mysql-test/t/alter_table.test

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



#