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

Move handler dependent tests to the specific handler (myisam, bdb, innodb) 

Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup
parent 06f59b28

mysql-test/include/varchar.inc

+0 −13
Original line number Diff line number Diff line
@@ -226,16 +226,3 @@ create table t1 (v varchar(65530), key(v(10))); 
insert into t1 values(repeat('a',65530));

select length(v) from t1 where v=repeat('a',65530);

drop table t1;
 


#

# Some errors/warnings on create

#



create table t1 (v varchar(65530), key(v));

drop table if exists t1;

create table t1 (v varchar(65536));

show create table t1;

drop table t1;

create table t1 (v varchar(65530) character set utf8);

show create table t1;

drop table t1;

mysql-test/r/innodb.result

+584 −0
Original line number Diff line number Diff line
@@ -1808,6 +1808,590 @@ set global innodb_thread_sleep_delay=10000; 
show variables like "innodb_thread_sleep_delay";

Variable_name	Value

innodb_thread_sleep_delay	10000

set storage_engine=INNODB;

drop table if exists t1,t2,t3;

--- Testing varchar ---

--- Testing varchar ---

create table t1 (v varchar(10), c char(10), t text);

insert into t1 values('+ ', '+ ', '+ ');

set @a=repeat(' ',20);

insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

*+         *+*+                    *

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL,

  `t` text

) ENGINE=InnoDB DEFAULT CHARSET=latin1

create table t2 like t1;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL,

  `t` text

) ENGINE=InnoDB DEFAULT CHARSET=latin1

create table t3 select * from t1;

show create table t3;

Table	Create Table

t3	CREATE TABLE `t3` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL,

  `t` text

) ENGINE=InnoDB DEFAULT CHARSET=latin1

alter table t1 modify c varchar(10);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(10) default NULL,

  `c` varchar(10) default NULL,

  `t` text

) ENGINE=InnoDB DEFAULT CHARSET=latin1

alter table t1 modify v char(10);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` char(10) default NULL,

  `c` varchar(10) default NULL,

  `t` text

) ENGINE=InnoDB DEFAULT CHARSET=latin1

alter table t1 modify t varchar(10);

Warnings:

Note	1265	Data truncated for column 't' at row 2

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` char(10) default NULL,

  `c` varchar(10) default NULL,

  `t` varchar(10) default NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+*+*+ *

*+*+*+         *

drop table t1,t2,t3;

create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL,

  `t` text,

  KEY `v` (`v`),

  KEY `c` (`c`),

  KEY `t` (`t`(10))

) ENGINE=InnoDB DEFAULT CHARSET=latin1

select count(*) from t1;

count(*)

270

insert into t1 values(concat('a',char(1)),concat('a',char(1)),concat('a',char(1)));

select count(*) from t1 where v='a';

count(*)

10

select count(*) from t1 where c='a';

count(*)

10

select count(*) from t1 where t='a';

count(*)

10

select count(*) from t1 where v='a  ';

count(*)

10

select count(*) from t1 where c='a  ';

count(*)

10

select count(*) from t1 where t='a  ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

count(*)

10

select count(*) from t1 where v like 'a%';

count(*)

11

select count(*) from t1 where c like 'a%';

count(*)

11

select count(*) from t1 where t like 'a%';

count(*)

11

select count(*) from t1 where v like 'a %';

count(*)

9

explain select count(*) from t1 where v='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index

explain select count(*) from t1 where c='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c	c	11	const	#	Using where; Using index

explain select count(*) from t1 where t='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	t	t	13	NULL	#	Using where

explain select count(*) from t1 where v like 'a%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

alter table t1 add key(v);

select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';

qq

*a*a*a*

*a *a*a *

*a  *a*a  *

*a   *a*a   *

*a    *a*a    *

*a     *a*a     *

*a      *a*a      *

*a       *a*a       *

*a        *a*a        *

*a         *a*a         *

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v,v_2	#	13	const	#	Using where

select v,count(*) from t1 group by v limit 10;

v	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select v,count(c) from t1 group by v limit 10;

v	count(c)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result v,count(c) from t1 group by v limit 10;

v	count(c)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select c,count(*) from t1 group by c limit 10;

c	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select c,count(t) from t1 group by c limit 10;

c	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result c,count(t) from t1 group by c limit 10;

c	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select t,count(*) from t1 group by t limit 10;

t	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select t,count(t) from t1 group by t limit 10;

t	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result t,count(t) from t1 group by t limit 10;

t	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(300) default NULL,

  `c` char(10) default NULL,

  `t` text,

  KEY `c` (`c`),

  KEY `t` (`t`(10)),

  KEY `v` (`v`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

select count(*) from t1 where v='a';

count(*)

10

select count(*) from t1 where v='a  ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

count(*)

10

select count(*) from t1 where v like 'a%';

count(*)

11

select count(*) from t1 where v like 'a %';

count(*)

9

explain select count(*) from t1 where v='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index

explain select count(*) from t1 where v like 'a%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	303	const	#	Using where

select v,count(*) from t1 group by v limit 10;

v	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

alter table t1 drop key v, add key v (v(30));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(300) default NULL,

  `c` char(10) default NULL,

  `t` text,

  KEY `c` (`c`),

  KEY `t` (`t`(10)),

  KEY `v` (`v`(30))

) ENGINE=InnoDB DEFAULT CHARSET=latin1

select count(*) from t1 where v='a';

count(*)

10

select count(*) from t1 where v='a  ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ';

count(*)

10

select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

count(*)

10

select count(*) from t1 where v like 'a%';

count(*)

11

select count(*) from t1 where v like 'a %';

count(*)

9

explain select count(*) from t1 where v='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

explain select count(*) from t1 where v like 'a%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

select v,count(*) from t1 group by v limit 10;

v	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

alter table t1 modify v varchar(600), drop key v, add key v (v);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(600) default NULL,

  `c` char(10) default NULL,

  `t` text,

  KEY `c` (`c`),

  KEY `t` (`t`(10)),

  KEY `v` (`v`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

select v,count(*) from t1 group by v limit 10;

v	count(*)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

select sql_big_result v,count(t) from t1 group by v limit 10;

v	count(t)

a	1

a	10

b	10

c	10

d	10

e	10

f	10

g	10

h	10

i	10

drop table t1;

create table t1 (a char(10), unique (a));

insert into t1 values ('a   ');

insert into t1 values ('a ');

ERROR 23000: Duplicate entry 'a' for key 1

alter table t1 modify a varchar(10);

insert into t1 values ('a '),('a  '),('a   '),('a         ');

ERROR 23000: Duplicate entry 'a ' for key 1

insert into t1 values ('a     ');

ERROR 23000: Duplicate entry 'a     ' for key 1

insert into t1 values ('a          ');

ERROR 23000: Duplicate entry 'a         ' for key 1

insert into t1 values ('a ');

ERROR 23000: Duplicate entry 'a ' for key 1

update t1 set a='a  ' where a like 'a%';

select concat(a,'.') from t1;

concat(a,'.')

a  .

update t1 set a='abc    ' where a like 'a ';

select concat(a,'.') from t1;

concat(a,'.')

a  .

update t1 set a='a      ' where a like 'a %';

select concat(a,'.') from t1;

concat(a,'.')

a      .

update t1 set a='a  ' where a like 'a      ';

select concat(a,'.') from t1;

concat(a,'.')

a  .

drop table t1;

create table t1 (v varchar(10), c char(10), t text, key(v(5)), key(c(5)), key(t(5)));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL,

  `t` text,

  KEY `v` (`v`(5)),

  KEY `c` (`c`(5)),

  KEY `t` (`t`(5))

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1;

create table t1 (v char(10) character set utf8);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` char(10) character set utf8 default NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1;

create table t1 (v varchar(10), c char(10)) row_format=fixed;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` varchar(10) default NULL,

  `c` char(10) default NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED

insert into t1 values('a','a'),('a ','a ');

select concat('*',v,'*',c,'*') from t1;

concat('*',v,'*',c,'*')

*a*a*

*a *a*

drop table t1;

create table t1 (v varchar(65530), key(v(10)));

insert into t1 values(repeat('a',65530));

select length(v) from t1 where v=repeat('a',65530);

length(v)

65530

drop table t1;

create table t1 (v varchar(65530), key(v));

ERROR HY000: Can't create table './test/t1.frm' (errno: 139)

create table t1 (v varchar(65536));

Warnings:

Note	1246	Converting column 'v' from VARCHAR to TEXT

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` mediumtext

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1;

create table t1 (v varchar(65530) character set utf8);

Warnings:

Note	1246	Converting column 'v' from VARCHAR to TEXT

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `v` mediumtext character set utf8

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1;

set storage_engine=MyISAM;

create table t1 (v varchar(16384)) engine=innodb;

drop table t1;

create table t1 (a bit, key(a)) engine=innodb;

mysql-test/r/myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -1171,9 +1171,9 @@ t1 CREATE TABLE `t1` ( 
  `v` mediumtext character set utf8

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set storage_engine=MyISAM;

create table t1 (v varchar(65535));

ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs

set storage_engine=MyISAM;

create table t1 (a int) engine=myisam;

drop table if exists t1;

Warnings:

mysql-test/t/bdb.test

+15 −0
Original line number Diff line number Diff line
@@ -954,4 +954,19 @@ drop table t1; 
let $default=`select @@storage_engine`;

set storage_engine=bdb;

source include/varchar.inc;



#

# Some errors/warnings on create

#



create table t1 (v varchar(65530), key(v));

drop table if exists t1;

create table t1 (v varchar(65536));

show create table t1;

drop table t1;

create table t1 (v varchar(65530) character set utf8);

show create table t1;

drop table t1;



# End varchar test

eval set storage_engine=$default;

mysql-test/t/innodb.test

+21 −6
Original line number Diff line number Diff line
@@ -1285,10 +1285,24 @@ show variables like "innodb_thread_sleep_delay"; 
# Test varchar

#



#let $default=`select @@storage_engine`;

#set storage_engine=INNODB;

#source include/varchar.inc;

#eval set storage_engine=$default;

let $default=`select @@storage_engine`;

set storage_engine=INNODB;

source include/varchar.inc;



#

# Some errors/warnings on create

#



--error 1005

create table t1 (v varchar(65530), key(v));

create table t1 (v varchar(65536));

show create table t1;

drop table t1;

create table t1 (v varchar(65530) character set utf8);

show create table t1;

drop table t1;



eval set storage_engine=$default;



# InnoDB specific varchar tests

create table t1 (v varchar(16384)) engine=innodb;
@@ -1297,3 +1311,4 @@ drop table t1; 
# The following should be moved to type_bit.test when innodb will support it

--error 1178

create table t1 (a bit, key(a)) engine=innodb;