Skip to content

Commit 8453159

Browse files
author
Deepa Dixit
committed
WL#7554: Switch to new default character set and change mtr test cases
Added comments to the tests for which the charset has been set to latin1 in the opt file.
1 parent 30ff18b commit 8453159

33 files changed

+89
-5
lines changed

‎mysql-test/suite/innodb/t/create_tablespace_replication.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# #
88
######################################################################
99

10+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
11+
# in the opt file. This test should be migrated to utf8mb4.
12+
1013
--source include/not_embedded.inc
1114
-- source include/master-slave.inc
1215

‎mysql-test/suite/innodb/t/end_range_check.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
--echo # Bug #23481444 OPTIMISER CALL ROW_SEARCH_MVCC() AND READ
55
--echo # THE INDEX APPLIED BY UNCOMMITTED ROWS.
66

7+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
8+
# in the opt file. This test should be migrated to utf8mb4.
9+
710
CREATE TABLE t1(f1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
811
f2 INT NOT NULL, f3 INT NOT NULL,
912
KEY(f2, f3))ENGINE=INNODB;

‎mysql-test/suite/innodb/t/flush-hang.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
--echo #Bug #21133329 HANGING "SYSTEM LOCK" WHEN EXECUTING "FLUSH TABLE ... FOR EXPORT"
44
--echo #
55

6+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
7+
# in the opt file. This test should be migrated to utf8mb4.
8+
69
--source include/not_embedded.inc
710
--source include/have_debug.inc
811

‎mysql-test/suite/innodb/t/innodb-alter.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
2+
# in the opt file. This test should be migrated to utf8mb4.
13

24
SET NAMES utf8;
35

‎mysql-test/suite/innodb/t/innodb-copy-alter-debug.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
########################################
1111
##### WL#7554 Force schema `test` to character set latin1
12-
##### This test should be migrated to utf8mb4
12+
##### This test should be migrated to utf8mb4. opt file added too.
1313
--disable_query_log
1414
let $testdbcs37=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
1515
alter schema test default character set latin1;

‎mysql-test/suite/innodb/t/innodb-system-table-view_cs.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
2+
# in the opt file. This test should be migrated to utf8mb4.
3+
14
--source include/have_case_sensitive_file_system.inc
25
--source suite/innodb/include/innodb-system-table-view.inc

‎mysql-test/suite/innodb/t/innodb-wl5522-debug.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
########################################
1818
##### WL#7554 Force schema `test` to character set latin1
19-
##### This test should be migrated to utf8mb4
19+
##### This test should be migrated to utf8mb4. opt file added too.
2020
--disable_query_log
2121
let $testdbcs43=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
2222
alter schema test default character set latin1;

‎mysql-test/suite/innodb/t/innodb-wl6445.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Don't test this under valgrind, memory leaks will occur due restart
33
--source include/not_valgrind.inc
44

5+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
6+
# in the opt file. This test should be migrated to utf8mb4.
7+
58
# Embedded has issues with restarting
69
--source include/not_embedded.inc
710

‎mysql-test/suite/innodb/t/innodb_bug14007109.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# Bug#14007109 RECURSIVE ACQ OF BLOCK LOCK IN S MODE, STATS UPDATE ASRT !RW_LOCK_OWN(LOCK, 352)
33
#
44

5+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
6+
# in the opt file. This test should be migrated to utf8mb4.
7+
8+
59
# The assertion only fails in debug versions, so no need to test in non-debug
610
-- source include/have_debug.inc
711

‎mysql-test/suite/innodb/t/innodb_bulk_create_index_replication.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# #
1414
######################################################################
1515

16+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
17+
# in the opt file. This test should be migrated to utf8mb4.
18+
1619
--source include/not_embedded.inc
1720
-- source include/master-slave.inc
1821

‎mysql-test/suite/innodb/t/innodb_wl6326_big.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
# max_row_count=10000 rows
2828
# vardir on tmpfs : ~ 375
2929
# vardir on disk : ~ 546
30+
31+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
32+
# in the opt file. This test should be migrated to utf8mb4.
33+
3034
--source include/big_test.inc
3135
# We go with "--send" and "--reap" and that fails with the embedded server.
3236
--source include/not_embedded.inc

‎mysql-test/suite/innodb/t/log_encrypt_2.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# InnoDB transparent tablespace data encryption
22
# This test case will test basic encryption support features.
33

4+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
5+
# in the opt file. This test should be migrated to utf8mb4.
6+
47
--source include/no_valgrind_without_big.inc
58
--source include/not_embedded.inc
69

‎mysql-test/suite/innodb/t/table_compress.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
########################################
1414
##### WL#7554 Force schema `test` to character set latin1
15-
##### This test should be migrated to utf8mb4
15+
##### This test should be migrated to utf8mb4. opt file added too.
1616
--disable_query_log
1717
let $testdbcs46=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
1818
alter schema test default character set latin1;

‎mysql-test/suite/innodb/t/table_encrypt_2.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# InnoDB transparent tablespace data encryption
22
# This test case will test basic encryption support features.
33

4+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
5+
# in the opt file. This test should be migrated to utf8mb4.
6+
47
--source include/no_valgrind_without_big.inc
58
--source include/not_embedded.inc
69

‎mysql-test/suite/innodb/t/table_encrypt_3.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# InnoDB transparent encrypted tablespace
22
# This test case will test basic encryption support features.
33

4+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
5+
# in the opt file. This test should be migrated to utf8mb4.
6+
47
--source include/no_valgrind_without_big.inc
58
--source include/not_embedded.inc
69
--source include/have_innodb_max_16k.inc

‎mysql-test/suite/innodb/t/table_encrypt_4.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# InnoDB transparent tablespace data encryption
22
# This test case will test export/import encrypted tablespace.
33

4+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
5+
# in the opt file. This test should be migrated to utf8mb4.
6+
47
--source include/no_valgrind_without_big.inc
58
--source include/not_embedded.inc
69

‎mysql-test/suite/innodb/t/table_encrypt_debug.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
########################################
2020
##### WL#7554 Force schema `test` to character set latin1
21-
##### This test should be migrated to utf8mb4
21+
##### This test should be migrated to utf8mb4. Added opt file too.
2222
--disable_query_log
2323
let $testdbcs48=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
2424
alter schema test default character set latin1;

‎mysql-test/suite/innodb/t/table_encrypt_kill.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# - server restarted with same options
88
#------------------------------------------------------------------------------
99

10+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
11+
# in the opt file. This test should be migrated to utf8mb4.
12+
1013
--source include/no_valgrind_without_big.inc
1114
--source include/not_embedded.inc
1215
--source include/big_test.inc

‎mysql-test/suite/innodb_fts/t/misc.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
--source include/no_valgrind_without_big.inc
22

3+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
4+
# in the opt file. This test should be migrated to utf8mb4.
5+
36
#------------------------------------------------------------------------------
47
# Test With alter/create/drop index
58
#------------------------------------------------------------------------------

‎mysql-test/suite/innodb_gis/t/multi_pk.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# WL#6745 InnoDB R-tree support
22
# This test case will test R-tree split.
33

4+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
5+
# in the opt file. This test should be migrated to utf8mb4.
6+
47
# Not supported in embedded
58
--source include/not_embedded.inc
69

‎mysql-test/suite/innodb_zip/t/4k.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Tests for setting innodb-page-size=4k
22

3+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
4+
# in the opt file. This test should be migrated to utf8mb4.
5+
36
SET default_storage_engine=InnoDB;
47

58
--disable_query_log

‎mysql-test/suite/innodb_zip/t/8k.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Tests for setting innodb-page-size=8k
22

3+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
4+
# in the opt file. This test should be migrated to utf8mb4.
35
SET default_storage_engine=InnoDB;
46

57
--disable_query_log

‎mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Testcase for worklog #5743: Lift the limit of index key prefixes
22

3+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
4+
# in the opt file. This test should be migrated to utf8mb4.
5+
36
SET default_storage_engine=InnoDB;
47

58
--disable_query_log

‎mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Testcase for worklog #5743: Lift the limit of index key prefixes
22

3+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
4+
# in the opt file. This test should be migrated to utf8mb4.
5+
36
SET default_storage_engine=InnoDB;
47

58
--disable_query_log

‎mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
########################################
1616
##### WL#7554 Force schema `test` to character set latin1
17-
##### This test should be migrated to utf8mb4
17+
##### This test should be migrated to utf8mb4. Added opt file too.
1818
--disable_query_log
1919
let $testdbcs57=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
2020
alter schema test default character set latin1;

‎mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
# Original Date: 2008-06-27 #
1313
################################################################################
1414

15+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
16+
# in the opt file. This test should be migrated to utf8mb4.
17+
1518
#
1619
# NOTE: PLEASE DO NOT ADD NOT INNODB SPECIFIC TESTCASES HERE !
1720
# TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN

‎mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# Original Date: 2008-06-27 #
1111
################################################################################
1212

13+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
14+
# in the opt file. This test should be migrated to utf8mb4.
15+
1316
#
1417
# NOTE: PLEASE DO NOT ADD NOT INNODB SPECIFIC TESTCASES HERE !
1518
# TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN

‎mysql-test/suite/parts/t/rpl_partition.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
let $engine_type= 'innodb';
99

10+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
11+
# in the opt file. This test should be migrated to utf8mb4.
12+
1013
set @old_global_binlog_format= @@global.binlog_format;
1114
set @old_session_binlog_format= @@session.binlog_format;
1215
SET GLOBAL binlog_format = 'ROW';

‎mysql-test/suite/sys_vars/t/character_set_connection_func.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
# #
2020
###############################################################################
2121

22+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
23+
# in the opt file. This test should be migrated to utf8mb4.
24+
2225
--echo '#--------------------FN_DYNVARS_011_01-------------------------#'
2326
##########################################################################
2427
# Check if setting character_set_connection is changed in new connection #

‎mysql-test/suite/sys_vars/t/character_set_results_func.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
# #
2020
###############################################################################
2121

22+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
23+
# in the opt file. This test should be migrated to utf8mb4.
24+
2225
--echo '#--------------------FN_DYNVARS_012_01-------------------------#'
2326
#######################################################################
2427
# Check if setting character_set_results is changed in new connection #

‎mysql-test/suite/sys_vars/t/collation_connection_func.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
# #
2020
###############################################################################
2121

22+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
23+
# in the opt file. This test should be migrated to utf8mb4.
24+
2225
--echo '#--------------------FN_DYNVARS_015_01-------------------------#'
2326
######################################################################
2427
# Check if setting collation_connection is changed in new connection #

‎mysql-test/t/merge.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
# Skip the test when log-bin is enabled due to presence of many unsafe statements
99
--source include/not_log_bin.inc
1010

11+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
12+
# in the opt file. This test should be migrated to utf8mb4.
13+
1114
# Set session binlog_format to STATEMENT to avoid BUG#20574550
1215
--disable_query_log
1316
SET binlog_format=STATEMENT;

‎mysql-test/t/partition_not_supported.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
--echo # an error.
77
--echo #
88

9+
# WL#7554: Added setting --bootstrap --character-set-server=latin1
10+
# in the opt file. This test should be migrated to utf8mb4.
11+
912
--echo #
1013
--echo # Test recursively for various storage engines.
1114
--echo #

0 commit comments

Comments
 (0)