Commit a8c96e68 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.1-bugteam -> 32124

parents 5d1d1057 d935c67b

mysql-test/r/alter_table.result

+18 −0
Original line number Diff line number Diff line
@@ -1222,4 +1222,22 @@ ALTER TABLE t1 CHANGE d c varchar(10); 
affected rows: 0

info: Records: 0  Duplicates: 0  Warnings: 0

DROP TABLE t1;

create table t1(f1 int not null, f2 int not null, key  (f1), key (f2));

select index_length into @unpaked_keys_size from

information_schema.tables where table_name='t1';

alter table t1 pack_keys=1;

select index_length into @paked_keys_size from

information_schema.tables where table_name='t1';

select (@unpaked_keys_size > @paked_keys_size);

(@unpaked_keys_size > @paked_keys_size)

1

select max_data_length into @orig_max_data_length from

information_schema.tables where table_name='t1';

alter table t1 max_rows=100;

select max_data_length into @changed_max_data_length from

information_schema.tables where table_name='t1';

select (@orig_max_data_length > @changed_max_data_length);

(@orig_max_data_length > @changed_max_data_length)

1

drop table t1;

End of 5.1 tests

mysql-test/r/information_schema.result

+9 −3
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ table_schema table_name column_name 
information_schema	COLUMNS	COLUMN_DEFAULT

information_schema	COLUMNS	COLUMN_TYPE

information_schema	EVENTS	EVENT_DEFINITION

information_schema	EVENTS	SQL_MODE

information_schema	PARTITIONS	PARTITION_EXPRESSION

information_schema	PARTITIONS	SUBPARTITION_EXPRESSION

information_schema	PARTITIONS	PARTITION_DESCRIPTION
@@ -768,8 +767,6 @@ information_schema ROUTINES ROUTINE_DEFINITION 
information_schema	ROUTINES	SQL_MODE

information_schema	TRIGGERS	ACTION_CONDITION

information_schema	TRIGGERS	ACTION_STATEMENT

information_schema	TRIGGERS	SQL_MODE

information_schema	TRIGGERS	DEFINER

information_schema	VIEWS	VIEW_DEFINITION

select table_name, column_name, data_type from information_schema.columns

where data_type = 'datetime';
@@ -1646,4 +1643,13 @@ drop table t1; 
drop function f1;

select * from information_schema.tables where 1=sleep(100000);

select * from information_schema.columns where 1=sleep(100000);

explain select count(*) from information_schema.tables;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	tables	ALL	NULL	NULL	NULL	NULL	NULL	Skip_open_table; Scanned all databases

explain select count(*) from information_schema.columns;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	columns	ALL	NULL	NULL	NULL	NULL	NULL	Open_frm_only; Scanned all databases

explain select count(*) from information_schema.views;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	views	ALL	NULL	NULL	NULL	NULL	NULL	Open_frm_only; Scanned all databases

End of 5.1 tests.

mysql-test/r/merge.result

+15 −6
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ ERROR HY000: Unable to open underlying table which is differently defined or of 
DROP TABLE t1, t2;

CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);

SELECT * FROM t2;

ERROR 42S02: Table 'test.t3' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

DROP TABLE t2;

CREATE TABLE t1(a INT, b TEXT);

CREATE TABLE tm1(a TEXT, b INT) ENGINE=MERGE UNION=(t1);
@@ -895,17 +895,19 @@ drop table t2; 
drop table t1;

CREATE TABLE tm1(a INT) ENGINE=MERGE UNION=(t1, t2);

SELECT * FROM tm1;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

CHECK TABLE tm1;

Table	Op	Msg_type	Msg_text

test.tm1	check	Error	Table 'test.t1' doesn't exist

test.tm1	check	Error	Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

test.tm1	check	error	Corrupt

CREATE TABLE t1(a INT);

SELECT * FROM tm1;

ERROR 42S02: Table 'test.t2' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

CHECK TABLE tm1;

Table	Op	Msg_type	Msg_text

test.tm1	check	Error	Table 'test.t2' doesn't exist

test.tm1	check	Error	Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

test.tm1	check	error	Corrupt

CREATE TABLE t2(a BLOB);

SELECT * FROM tm1;
@@ -1199,7 +1201,7 @@ c1 
3

RENAME TABLE t2 TO t5;

SELECT * FROM t3 ORDER BY c1;

ERROR 42S02: Table 'test.t2' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

RENAME TABLE t5 TO t2;

SELECT * FROM t3 ORDER BY c1;

c1
@@ -1233,7 +1235,7 @@ UNLOCK TABLES; 
# 4. Alter table rename.

ALTER TABLE t2 RENAME TO t5;

SELECT * FROM t3 ORDER BY c1;

ERROR 42S02: Table 'test.t2' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

ALTER TABLE t5 RENAME TO t2;

SELECT * FROM t3 ORDER BY c1;

c1
@@ -1317,7 +1319,7 @@ LOCK TABLES t1 WRITE, t2 WRITE; 
INSERT INTO t1 VALUES (1);

DROP TABLE t1;

SELECT * FROM t2;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

SELECT * FROM t1;

ERROR 42S02: Table 'test.t1' doesn't exist

UNLOCK TABLES;
@@ -2006,6 +2008,13 @@ test.t1 optimize status OK 
FLUSH TABLES m1, t1;

UNLOCK TABLES;

DROP TABLE t1, m1;

CREATE TABLE tm1 (c1 INT) ENGINE=MRG_MYISAM UNION=(t1) INSERT_METHOD=FIRST;

SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE

TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT

NULL	test	tm1	BASE TABLE	NULL	NULL	NULL	#	#	#	#	#	#	#	#	#	#	NULL	#	#	Unable to open underlying table which is differently defined or of non-MyISAM ty

DROP TABLE tm1;

End of 5.1 tests

CREATE TABLE t1(C1 INT, C2 INT, KEY C1(C1), KEY C2(C2)) ENGINE=MYISAM;

CREATE TABLE t2(C1 INT, C2 INT, KEY C1(C1), KEY C2(C2)) ENGINE=MYISAM;

CREATE TABLE t3(C1 INT, C2 INT, KEY C1(C1), KEY C2(C2)) ENGINE=MYISAM;

mysql-test/r/show_check.result

+4 −4
Original line number Diff line number Diff line
@@ -1001,8 +1001,8 @@ def TRIGGERS EVENT_OBJECT_TABLE Table 253 192 2 N 1 0 33 
def			TRIGGERS	ACTION_STATEMENT	Statement	252	589815	10	N	17	0	33

def			TRIGGERS	ACTION_TIMING	Timing	253	18	6	N	1	0	33

def			TRIGGERS	CREATED	Created	12	19	0	Y	128	0	63

def			TRIGGERS	SQL_MODE	sql_mode	252	589815	0	N	17	0	33

def			TRIGGERS	DEFINER	Definer	252	589815	14	N	17	0	33

def			TRIGGERS	SQL_MODE	sql_mode	253	24576	0	N	1	0	33

def			TRIGGERS	DEFINER	Definer	253	231	14	N	1	0	33

def			TRIGGERS	CHARACTER_SET_CLIENT	character_set_client	253	96	6	N	1	0	33

def			TRIGGERS	COLLATION_CONNECTION	collation_connection	253	96	6	N	1	0	33

def			TRIGGERS	DATABASE_COLLATION	Database Collation	253	96	17	N	1	0	33
@@ -1045,8 +1045,8 @@ def TRIGGERS ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_OLD_TABLE 253 192 0 Y 
def			TRIGGERS	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_NEW_TABLE	253	192	0	Y	0	0	33

def			TRIGGERS	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_OLD_ROW	253	9	3	N	1	0	33

def			TRIGGERS	ACTION_REFERENCE_NEW_ROW	ACTION_REFERENCE_NEW_ROW	253	9	3	N	1	0	33

def			TRIGGERS	SQL_MODE	SQL_MODE	252	589815	0	N	17	0	33

def			TRIGGERS	DEFINER	DEFINER	252	589815	14	N	17	0	33

def			TRIGGERS	SQL_MODE	SQL_MODE	253	24576	0	N	1	0	33

def			TRIGGERS	DEFINER	DEFINER	253	231	14	N	1	0	33

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	SQL_MODE	DEFINER

NULL	test	t1_bi	INSERT	NULL	test	t1	NULL	SET @a = 1	ROW	BEFORE	NULL	NULL	OLD	NEW		root@localhost

----------------------------------------------------------------

mysql-test/suite/funcs_1/r/is_columns_is.result

+6 −6
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ NULL information_schema EVENTS LAST_ALTERED 18 0000-00-00 00:00:00 NO datetime N 
NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	

NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	

NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	

NULL	information_schema	EVENTS	SQL_MODE	12	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	

NULL	information_schema	EVENTS	SQL_MODE	12		NO	varchar	8192	24576	NULL	NULL	utf8	utf8_general_ci	varchar(8192)			select	

NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	

NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	

NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select
@@ -277,12 +277,12 @@ NULL information_schema TRIGGERS CHARACTER_SET_CLIENT 20 NO varchar 32 96 NULL 
NULL	information_schema	TRIGGERS	COLLATION_CONNECTION	21		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	

NULL	information_schema	TRIGGERS	CREATED	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	

NULL	information_schema	TRIGGERS	DATABASE_COLLATION	22		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	

NULL	information_schema	TRIGGERS	DEFINER	19	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	

NULL	information_schema	TRIGGERS	DEFINER	19		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	

NULL	information_schema	TRIGGERS	EVENT_MANIPULATION	4		NO	varchar	6	18	NULL	NULL	utf8	utf8_general_ci	varchar(6)			select	

NULL	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	

NULL	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	

NULL	information_schema	TRIGGERS	EVENT_OBJECT_TABLE	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	

NULL	information_schema	TRIGGERS	SQL_MODE	18	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	

NULL	information_schema	TRIGGERS	SQL_MODE	18		NO	varchar	8192	24576	NULL	NULL	utf8	utf8_general_ci	varchar(8192)			select	

NULL	information_schema	TRIGGERS	TRIGGER_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	

NULL	information_schema	TRIGGERS	TRIGGER_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	

NULL	information_schema	TRIGGERS	TRIGGER_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select
@@ -412,7 +412,7 @@ NULL information_schema COLUMNS NUMERIC_SCALE bigint NULL NULL NULL NULL bigint( 
NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime

3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)

3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)

1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext

3.0000	information_schema	EVENTS	SQL_MODE	varchar	8192	24576	utf8	utf8_general_ci	varchar(8192)

NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime

NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime

3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
@@ -635,8 +635,8 @@ NULL information_schema TRIGGERS ACTION_ORDER bigint NULL NULL NULL NULL bigint( 
3.0000	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	varchar	3	9	utf8	utf8_general_ci	varchar(3)

3.0000	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	varchar	3	9	utf8	utf8_general_ci	varchar(3)

NULL	information_schema	TRIGGERS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime

1.0000	information_schema	TRIGGERS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext

1.0000	information_schema	TRIGGERS	DEFINER	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext

3.0000	information_schema	TRIGGERS	SQL_MODE	varchar	8192	24576	utf8	utf8_general_ci	varchar(8192)

3.0000	information_schema	TRIGGERS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)

3.0000	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)

3.0000	information_schema	TRIGGERS	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)

3.0000	information_schema	TRIGGERS	DATABASE_COLLATION	varchar	32	96	utf8	utf8_general_ci	varchar(32)