innob_zip.4k,8k

mysql-test/suite/innodb/r/innodb_bug12661768.result

 SET SESSION foreign_key_checks=0;
-ERROR 23000: Foreign key constraint for table 'bug12661768_1', record '3-bbb' would lead to a duplicate entry in table 'bug12661768_2', key 'ab_on_2'
+ERROR 23000: Foreign key constraint for table 'bug12661768_1ä1111111111111111111111111111111111111111111111111', record '3-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' would lead to a duplicate entry in table 'bug12661768_2ä2222222222222222222222222222222222222222222', key 'ab_on_2_fkfkfäfkffkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfkfk'

mysql-test/suite/innodb/t/innodb_bug70867.test

@@ -4,7 +4,6 @@
 
 --source include/have_innodb.inc
 
-
 # This test uses chmod, can't be run with root permissions
 --source include/not_as_root.inc
 # Embedded server does not support crashing
@@ -14,36 +13,38 @@
 # Aim of the TC is still being served by keep it enabled on other platforms.
 --source include/not_windows.inc
 
-
 #-----------------------------------------------------------------------------
-#
+
 let $MYSQL_DATA_DIR = `select @@datadir`;
 let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
 let $args=--loose-console --default-storage-engine=innodb > $SEARCH_FILE 2>&1;
 
 #-----------------------------------------------------------------------------
 use test;
-#
+#Shutdown the server
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 60
+--shutdown_server
 --source include/wait_until_disconnected.inc
+
 #
 --mkdir $MYSQL_DATA_DIR/tmpdata
 --chmod 0400 $MYSQL_DATA_DIR/tmpdata
 --error 1
---exec $MYSQLD_CMD $args --innodb_data_home_dir=$MYSQL_DATA_DIR/tmpdata 
+--exec $MYSQLD_CMD --innodb_data_home_dir=$MYSQL_DATA_DIR/tmpdata $args
+
 let SEARCH_PATTERN = returned OS error 113;
 --source include/search_pattern_in_file.inc
 let SEARCH_PATTERN = The error means mysqld does not have the access rights to;
 --source include/search_pattern_in_file.inc
-#--exec cat $SEARCH_FILE
+
+--exec cat $SEARCH_FILE
+
 #
 --remove_file $SEARCH_FILE
 --chmod 0777 $MYSQL_DATA_DIR/tmpdata
 --rmdir $MYSQL_DATA_DIR/tmpdata
 #
 --echo "restarting server in normal mode"
---enable_reconnect
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --enable_reconnect
 --source include/wait_until_connected_again.inc

mysql-test/suite/innodb_zip/r/innodb_index_large_prefix_4k.result

@@ -49,7 +49,7 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	NULL
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	
 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 a1	a2 = repeat("a", 10000)
 9	1
@@ -72,7 +72,7 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	NULL
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	
 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 a1	a2 = repeat("a", 10000)
 9	1
@@ -133,10 +133,10 @@ Level	Code	Message
 Warning	1071	Specified key was too long; max key length is 768 bytes
 create index idx4 on worklog5743_2(a2(768));
 Warnings:
-Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_2'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx4`. This is deprecated and will be disallowed in a future release.
 show warnings;
 Level	Code	Message
-Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_2'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx4`. This is deprecated and will be disallowed in a future release.
 create index idx5 on worklog5743_2(a1, a2(765));
 ERROR 42000: Specified key was too long; max key length is 768 bytes
 show warnings;
@@ -220,13 +220,13 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_1	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_1	ref	idx6	idx6	5	const	1	
 explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_2	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_2	ref	idx6	idx6	5	const	1	
 explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_4	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_4	ref	idx6	idx6	5	const	1	
 select a1, left(a2, 20) from worklog5743_1 where a1 = 9;
 a1	left(a2, 20)
 9	aaaaaaaaaaaaaaaaaaaa
@@ -348,10 +348,10 @@ Level	Code	Message
 Warning	1071	Specified key was too long; max key length is 768 bytes
 create index idx2 on worklog5743(a(768));
 Warnings:
-Note	1831	Duplicate index 'idx2' defined on the table 'test.worklog5743'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx2`. This is deprecated and will be disallowed in a future release.
 show warnings;
 Level	Code	Message
-Note	1831	Duplicate index 'idx2' defined on the table 'test.worklog5743'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx2`. This is deprecated and will be disallowed in a future release.
 show create table worklog5743;
 Table	Create Table
 worklog5743	CREATE TABLE `worklog5743` (

mysql-test/suite/innodb_zip/r/innodb_index_large_prefix_8k.result

@@ -49,7 +49,7 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	NULL
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	
 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 a1	a2 = repeat("a", 10000)
 9	1
@@ -72,7 +72,7 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	NULL
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	
 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
 a1	a2 = repeat("a", 10000)
 9	1
@@ -165,10 +165,10 @@ Level	Code	Message
 Warning	1071	Specified key was too long; max key length is 1536 bytes
 create index idx4 on worklog5743_4(a2(1536));
 Warnings:
-Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx4`. This is deprecated and will be disallowed in a future release.
 show warnings;
 Level	Code	Message
-Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index `idx4`. This is deprecated and will be disallowed in a future release.
 create index idx5 on worklog5743_4(a1, a2(1533));
 ERROR 42000: Specified key was too long; max key length is 1536 bytes
 show warnings;
@@ -257,16 +257,16 @@ select @@session.tx_isolation;
 REPEATABLE-READ
 explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_1	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_1	ref	idx6	idx6	5	const	1	
 explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_2	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_2	ref	idx6	idx6	5	const	1	
 explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_4	ref	idx6	idx6	5	const	1	NULL
+1	SIMPLE	worklog5743_4	ref	idx6	idx6	5	const	1	
 explain select a1, left(a2, 20) from worklog5743_8 where a1 = 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_8	ref	idx5	idx5	5	const	1	NULL
+1	SIMPLE	worklog5743_8	ref	idx5	idx5	5	const	1	
 select a1, left(a2, 20) from worklog5743_1 where a1 = 9;
 a1	left(a2, 20)
 9	aaaaaaaaaaaaaaaaaaaa

mysql-test/suite/innodb_zip/t/innodb_index_large_prefix_4k.opt

+--innodb_page_size=4096

mysql-test/suite/innodb_zip/t/innodb_index_large_prefix_4k.test

 # Testcase for worklog #5743: Lift the limit of index key prefixes
 
 --source include/have_innodb.inc
---source include/have_innodb_4k.inc
+
 SET default_storage_engine=InnoDB;
 
 let $innodb_file_format_orig=`select @@innodb_file_format`;

mysql-test/suite/innodb_zip/t/innodb_index_large_prefix_8k.opt

+--innodb_page_size=8192
\ No newline at end of file

mysql-test/suite/innodb_zip/t/innodb_index_large_prefix_8k.test

 # Testcase for worklog #5743: Lift the limit of index key prefixes
 
 --source include/have_innodb.inc
---source include/have_innodb_8k.inc
+
 SET default_storage_engine=InnoDB;
 
 let $innodb_file_format_orig=`select @@innodb_file_format`;