Skip to content

Commit 1cc715e

Browse files
berntmberntm
committed
Bug#25589596 PRELIMINARY FIX SOME TESTS BY SETTING DB TEST TO LATIN1 (WL#7554)
1 parent 5b84c86 commit 1cc715e

File tree

373 files changed

+7087
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

373 files changed

+7087
-0
lines changed

‎mysql-test/suite/binlog/t/binlog_drop_if_exists.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs1=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112

213
# BUG#13684:
314
# SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged if routine
@@ -114,3 +125,11 @@ if($fixed_bug_25705)
114125
--source include/show_binlog_events.inc
115126

116127
enable_warnings;
128+
129+
########################################
130+
##### WL#7554 set schema `test` back to what it was
131+
--disable_query_log
132+
drop schema test;
133+
--eval create schema test character set $testdbcs1;
134+
--enable_query_log
135+
########################################

‎mysql-test/suite/binlog/t/binlog_stm_blackhole.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs2=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
--source include/have_myisam.inc
213
--source include/force_myisam_default.inc
314
# This test checks Full Text Search in a MyISAM table, the results for which are different with an innodb table.
@@ -8,3 +19,11 @@
819
-- source include/not_embedded.inc
920
-- source include/have_binlog_format_statement.inc
1021
-- source extra/binlog_tests/blackhole.test
22+
23+
########################################
24+
##### WL#7554 set schema `test` back to what it was
25+
--disable_query_log
26+
drop schema test;
27+
--eval create schema test character set $testdbcs2;
28+
--enable_query_log
29+
########################################

‎mysql-test/suite/binlog_gtid/t/binlog_gtid_next_partially_failed_stmts.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs3=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
# ==== Purpose ====
213
#
314
# Verify that a partially failed statement saves its gtid into
@@ -251,3 +262,11 @@ CHECKSUM TABLE t1, t_non_existent;
251262
# Clean up
252263
DROP TABLE t1;
253264
DROP USER u1@h;
265+
266+
########################################
267+
##### WL#7554 set schema `test` back to what it was
268+
--disable_query_log
269+
drop schema test;
270+
--eval create schema test character set $testdbcs3;
271+
--enable_query_log
272+
########################################

‎mysql-test/suite/binlog_nogtid/t/binlog_old_versions.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs4=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112

213
# Test that old binlog formats can be read.
314

@@ -144,3 +155,11 @@ DROP TABLE t1, t2, t3;
144155
#SELECT * FROM t2 ORDER BY a;
145156
#SELECT COUNT(*) FROM t3;
146157
#--source include/rpl_end.inc
158+
159+
########################################
160+
##### WL#7554 set schema `test` back to what it was
161+
--disable_query_log
162+
drop schema test;
163+
--eval create schema test character set $testdbcs4;
164+
--enable_query_log
165+
########################################

‎mysql-test/suite/binlog_nogtid/t/binlog_stm_mix_innodb_myisam.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs5=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112

213
# This is a wrapper for binlog.test so that the same test case can be used
314
# For both statement and row based bin logs 9/19/2005 [jbm]
@@ -14,3 +25,11 @@ set @@session.binlog_format=@@global.binlog_format;
1425

1526

1627
--echo end of tests
28+
29+
########################################
30+
##### WL#7554 set schema `test` back to what it was
31+
--disable_query_log
32+
drop schema test;
33+
--eval create schema test character set $testdbcs5;
34+
--enable_query_log
35+
########################################

‎mysql-test/suite/binlog_nogtid/t/binlog_unsafe.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs6=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112

213
# ==== Background ====
314
#
@@ -765,3 +776,11 @@ DROP TABLE create_replace_test;
765776
DROP TABLE insert_2_keys;
766777

767778
--echo "End of tests"
779+
780+
########################################
781+
##### WL#7554 set schema `test` back to what it was
782+
--disable_query_log
783+
drop schema test;
784+
--eval create schema test character set $testdbcs6;
785+
--enable_query_log
786+
########################################

‎mysql-test/suite/gcol/t/gcol_bugfixes.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs7=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_bugfixes.test #
314
# #
@@ -736,3 +747,11 @@ SELECT
736747
FROM t1;
737748

738749
DROP TABLE t1;
750+
751+
########################################
752+
##### WL#7554 set schema `test` back to what it was
753+
--disable_query_log
754+
drop schema test;
755+
--eval create schema test character set $testdbcs7;
756+
--enable_query_log
757+
########################################

‎mysql-test/suite/gcol/t/gcol_bugfixes_latin1.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs8=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_bugfixes_latin1.test #
314
# #
@@ -38,3 +49,11 @@ SHOW CREATE TABLE t1;
3849

3950
SET NAMES DEFAULT;
4051
DROP TABLE t1;
52+
53+
########################################
54+
##### WL#7554 set schema `test` back to what it was
55+
--disable_query_log
56+
drop schema test;
57+
--eval create schema test character set $testdbcs8;
58+
--enable_query_log
59+
########################################

‎mysql-test/suite/gcol/t/gcol_column_def_options_innodb.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs9=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_column_def_options_innodb.test #
314
# #
@@ -46,3 +57,11 @@ let $support_native_partitioning= 1;
4657
#------------------------------------------------------------------------------#
4758
# Cleanup
4859
--source suite/gcol/inc/gcol_cleanup.inc
60+
61+
########################################
62+
##### WL#7554 set schema `test` back to what it was
63+
--disable_query_log
64+
drop schema test;
65+
--eval create schema test character set $testdbcs9;
66+
--enable_query_log
67+
########################################

‎mysql-test/suite/gcol/t/gcol_column_def_options_myisam.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs10=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_column_def_options_myisam.test #
314
# #
@@ -46,3 +57,11 @@ let $support_native_partitioning= 0;
4657
#------------------------------------------------------------------------------#
4758
# Cleanup
4859
--source suite/gcol/inc/gcol_cleanup.inc
60+
61+
########################################
62+
##### WL#7554 set schema `test` back to what it was
63+
--disable_query_log
64+
drop schema test;
65+
--eval create schema test character set $testdbcs10;
66+
--enable_query_log
67+
########################################

‎mysql-test/suite/gcol/t/gcol_keys_innodb.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs11=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_keys_innodb.test #
314
# #
@@ -93,3 +104,11 @@ DROP TABLE t1,t2;
93104
#------------------------------------------------------------------------------#
94105
# Cleanup
95106
--source suite/gcol/inc/gcol_cleanup.inc
107+
108+
########################################
109+
##### WL#7554 set schema `test` back to what it was
110+
--disable_query_log
111+
drop schema test;
112+
--eval create schema test character set $testdbcs11;
113+
--enable_query_log
114+
########################################

‎mysql-test/suite/gcol/t/gcol_keys_myisam.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs12=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_keys_myisam.test #
314
# #
@@ -47,3 +58,11 @@ let $support_virtual_index= 0;
4758
#------------------------------------------------------------------------------#
4859
# Cleanup
4960
--source suite/gcol/inc/gcol_cleanup.inc
61+
62+
########################################
63+
##### WL#7554 set schema `test` back to what it was
64+
--disable_query_log
65+
drop schema test;
66+
--eval create schema test character set $testdbcs12;
67+
--enable_query_log
68+
########################################

‎mysql-test/suite/gcol/t/gcol_non_stored_columns_innodb.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs13=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_non_stored_columns_innodb.test #
314
# #
@@ -46,3 +57,11 @@ eval SET @@session.default_storage_engine = 'InnoDB';
4657
#------------------------------------------------------------------------------#
4758
# Cleanup
4859
--source suite/gcol/inc/gcol_cleanup.inc
60+
61+
########################################
62+
##### WL#7554 set schema `test` back to what it was
63+
--disable_query_log
64+
drop schema test;
65+
--eval create schema test character set $testdbcs13;
66+
--enable_query_log
67+
########################################

‎mysql-test/suite/gcol/t/gcol_non_stored_columns_myisam.test

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
########################################
2+
##### WL#7554 Force schema `test` to character set latin1
3+
##### This test should be migrated to utf8mb4
4+
--disable_query_log
5+
let $testdbcs14=`select default_character_set_name from information_schema.schemata where schema_name='test'`;
6+
drop schema test;
7+
create schema test character set latin1;
8+
use test;
9+
--enable_query_log
10+
########################################
11+
112
################################################################################
213
# t/gcol_non_stored_columns_myisam.test #
314
# #
@@ -46,3 +57,11 @@ eval SET @@session.default_storage_engine = 'MyISAM';
4657
#------------------------------------------------------------------------------#
4758
# Cleanup
4859
--source suite/gcol/inc/gcol_cleanup.inc
60+
61+
########################################
62+
##### WL#7554 set schema `test` back to what it was
63+
--disable_query_log
64+
drop schema test;
65+
--eval create schema test character set $testdbcs14;
66+
--enable_query_log
67+
########################################

0 commit comments

Comments
 (0)