Commit 466701cd authored by unknown's avatar unknown
Browse files

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

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


mysql-test/t/create.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/include/mix1.inc:
  Merge 5.0 -> 5.1
mysql-test/r/create.result:
  Merge 5.0 -> 5.1
mysql-test/r/innodb_mysql.result:
  Merge 5.0 -> 5.1
mysql-test/t/sp.test:
  Merge 5.0 -> 5.1
parents c35506f9 15a86d18

mysql-test/include/mix1.inc

+6 −0
Original line number Diff line number Diff line
@@ -342,6 +342,12 @@ SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 
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;

# Test of behaviour with CREATE ... SELECT

#

mysql-test/r/innodb_mysql.result

+6 −0
Original line number Diff line number Diff line
@@ -300,6 +300,12 @@ 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;

CREATE TABLE t1 (a int, b int);

insert into t1 values (1,1),(1,2);

CREATE TABLE t2 (primary key (a)) select * from t1;

mysql-test/t/lock_multi.test

+3 −0
Original line number Diff line number Diff line
@@ -244,7 +244,10 @@ DROP DATABASE mysqltest_1; 
# 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

mysql-test/t/ssl_des-master.opt

+1 −1
Original line number Diff line number Diff line 
--ssl-cert=std_data/server-cert-des.pem --ssl-key=std_data/server-key-des.pem
 
--loose_ssl-cert=std_data/server-cert-des.pem --loose_ssl-key=std_data/server-key-des.pem