Skip to content

Commit f9d7b83

Browse files
author
Parakh Agarwal
committed
Wl#10185: Remove all references to embedded server from MTR tests
WL#9816 has removed ability to build embedded server. This WL should remove all references from MTR tests. Reviewed by: Anitha Gopi <[email protected]> Pavan Naik <[email protected]> Deepa Dixit <[email protected]> RB: 15528, 15671
1 parent dc32599 commit f9d7b83

File tree

816 files changed

+6841
-18113
lines changed

Some content is hidden

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

816 files changed

+6841
-18113
lines changed

mysql-test/extra/binlog_tests/binlog.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44

55
-- source include/have_log_bin.inc
6-
-- source include/not_embedded.inc
76
-- source include/have_debug.inc
87

98
RESET MASTER;

mysql-test/extra/binlog_tests/binlog_cache_stat.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Embedded server doesn't support binlog
2-
-- source include/not_embedded.inc
31

42
# Creating tables
53
--disable_warnings

mysql-test/extra/binlog_tests/blackhole.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Simple test for blackhole example
33
# Taken from the select test
44
#
5-
-- source include/not_embedded.inc
65
-- source include/have_blackhole.inc
76
-- source include/have_log_bin.inc
87

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
-- source include/not_embedded.inc
21
-- source include/have_log_bin.inc
32

43
--character_set cp932

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
--source include/not_embedded.inc
21
--source include/have_log_bin.inc
32

43
#

mysql-test/extra/binlog_tests/database.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source include/have_log_bin.inc;
2-
source include/not_embedded.inc;
32

43
# Checking that the drop of a database does not replicate anything in
54
# addition to the drop of the database

mysql-test/extra/binlog_tests/insert_select-binlog.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Embedded server doesn't support binlog
2-
-- source include/not_embedded.inc
31
-- source include/have_log_bin.inc
42

53
--disable_warnings

mysql-test/extra/rpl_tests/rpl_replication_observers_example_plugin_server_startup.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
--let $include_filename= rpl_replication_observers_example_plugin_server_startup.inc
2626
--source include/begin_include_file.inc
2727

28-
--source include/not_embedded.inc
2928
--source include/have_binlog_format_mixed.inc
3029
--source include/not_group_replication_plugin.inc
3130
--source include/have_replication_observers_example_plugin.inc

mysql-test/include/common-tests.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,12 +1798,8 @@ select period as "Nuvarande period" from t1 group by "Nuvarande period" limit 1;
17981798
show tables;
17991799
show tables from test like "s%";
18001800
show tables from test like "t?";
1801-
# We mask out the Privileges column because it differs with embedded server
1802-
--replace_column 8 #
18031801
show full columns from t2;
1804-
--replace_column 8 #
18051802
show full columns from t2 from test like 'f%';
1806-
--replace_column 8 #
18071803
show full columns from t2 from test like 's%';
18081804
analyze table t2;
18091805
--replace_column 7 #

mysql-test/include/excludenoskip.list

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,12 @@ no_explain_protocol.inc
128128
no_cursor_protocol.inc
129129

130130
# 6.0 Different builds
131-
is_embedded.inc
132-
not_embedded.inc
133-
not_windows_embedded.inc
134131
have_valgrind.inc
135132
not_valgrind.inc
136133
not_ubsan.inc
137134
not_asan.inc
138135

139136
# 7.0 Few skipped test-cases
140-
mysql_embedded.test
141137
mysql_tzinfo_to_sql_sys.test
142138
wrapper.test
143139

0 commit comments

Comments
 (0)