Commit 15a86d18 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/create.result:
  Merge
mysql-test/t/create.test:
  Merge
mysql-test/t/view.test:
  Remove the disable_warnings part as engine=innodb has been removed
parents 54fadc5b d8d57c77

mysql-test/r/create.result

+0 −6
Original line number Diff line number Diff line
@@ -767,11 +767,5 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295

drop table t1;

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

create table t1 (upgrade int);

drop table t1;

mysql-test/r/innodb_mysql.result

+6 −0
Original line number Diff line number Diff line
@@ -347,3 +347,9 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

mysql-test/t/create.test

+0 −8
Original line number Diff line number Diff line
@@ -666,14 +666,6 @@ alter table t1 max_rows=100000000000; 
show create table t1;

drop table t1;



#

# Bug#17530: Incorrect key truncation on table creation caused server crash.

#

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

  character set utf8 collate utf8_general_ci;

insert into t1 values('aaa');

drop table t1;



#

# Bug#21772: can not name a column 'upgrade' when create a table

#

mysql-test/t/innodb_mysql.test

+8 −0
Original line number Diff line number Diff line
@@ -318,3 +318,11 @@ SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 
  WHERE t1.name LIKE 'A%' OR FALSE;



DROP TABLE t1,t2;



#

# Bug#17530: Incorrect key truncation on table creation caused server crash.

#

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

  character set utf8 collate utf8_general_ci;

insert into t1 values('aaa');

drop table t1;

mysql-test/t/lock_multi.test

+3 −0
Original line number Diff line number Diff line
@@ -225,7 +225,10 @@ DROP TABLE t1; 
# Bug #17264: MySQL Server freeze

#

connection locker;

# Disable warnings to allow test to run also without InnoDB

--disable_warnings

create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;

--enable_warnings

lock tables t1 write;

connection writer;

--sleep 2