database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@neptunus.(none)
2006-10-19 01:01:54 +02:00
parent 9a50d74fbb 485772e308
commit 179c17adfa
6 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/create.result
View File

@ -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;

6
mysql-test/r/innodb_mysql.result
View File

@ -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;

8
mysql-test/t/create.test
View File

@ -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
#

8
mysql-test/t/innodb_mysql.test
View File

@ -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;

3
mysql-test/t/lock_multi.test
View File

@ -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

3
mysql-test/t/sp.test
View File

@ -5630,7 +5630,10 @@ drop procedure bug16887|
# Bug#13575 SP funcs in select with distinct/group and order by can
# produce bad data
#
# Disable warnings to allow test to run also without InnoDB
--disable_warnings
create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
--enable_warnings
insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
CREATE FUNCTION bug13575 ( p1 integer )
returns varchar(3)