Commit 1c1f612f authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 2337181f 3d891d76

mysql-test/r/alter_table.result

+4 −0
Original line number Diff line number Diff line
@@ -562,3 +562,7 @@ desc t1; 
Field	Type	Null	Key	Default	Extra

mycol	int(10)	NO		0	

drop table t1;

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;

mysql-test/t/alter_table.test

+10 −0
Original line number Diff line number Diff line
@@ -412,3 +412,13 @@ create table t1 (mycol int(10) not null); 
alter table t1 alter column mycol set default 0;

desc t1;

drop table t1;



#

# Bug#6073 "ALTER table minor glich": ALTER TABLE complains that an index

# without # prefix is not allowed for TEXT columns, while index

# is defined with prefix.

# 

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;