Skip to content

Commit 97c9ea1

Browse files
committed
WL#7575 Remove ndbinfo's usage of other engine
- remove ndbinfo_create.inc, ndbinfo_drop.inc and have_ndbinfo.inc - these files have only been active in pre 7.1 versions and have since no effect rather than confusion.
1 parent 25843cf commit 97c9ea1

9 files changed

+0
-87
lines changed

mysql-test/suite/ndb/t/have_ndbinfo.inc

-40
This file was deleted.

mysql-test/suite/ndb/t/ndb_join_pushdown.inc

-8
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ connection ddl;
1111
drop table if exists t1,t2,t3,t4;
1212
--enable_warnings
1313

14-
#######################################
15-
# Enable ndb$info counters for SPJ block.
16-
17-
connection ddl;
18-
--source ndbinfo_create.inc
19-
2014
connection spj;
2115
# Save old mysqld counter values.
2216
--disable_warnings ONCE
@@ -4838,7 +4832,5 @@ DROP TABLE ndb_order_test, ndb_user_test;
48384832
--source ndb_join_pushdown_counters.inc
48394833
drop table server_counts_at_startup;
48404834

4841-
--source ndbinfo_drop.inc
4842-
48434835
set ndb_join_pushdown = @save_ndb_join_pushdown;
48444836

mysql-test/suite/ndb/t/ndbinfo.test

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ CREATE TEMPORARY TABLE `t1` (
1616
`dummy` INT UNSIGNED
1717
) ENGINE=NDBINFO;
1818

19-
--source ndbinfo_create.inc
20-
2119
USE ndbinfo;
2220

2321
# Current usage may vary. Therefor the test only checks that if falls in the
@@ -739,4 +737,3 @@ UPDATE ndb$config_params SET param_number=1 WHERE param_name = "NoOfReplicas";
739737
--error ER_OPEN_AS_READONLY
740738
UPDATE config_params SET param_number=1 WHERE param_name = "NoOfReplicas";
741739

742-
--source ndbinfo_drop.inc

mysql-test/suite/ndb/t/ndbinfo_cache.test

-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
--source include/have_query_cache.inc
77
--source include/have_ndb.inc
88

9-
--source ndbinfo_create.inc
10-
119
USE ndbinfo;
1210

1311
# BUG#59831 ndbinfo - counters not increasing after first query
@@ -30,5 +28,3 @@ show status like "Qcache_queries_in_cache";
3028
show status like "Qcache_inserts";
3129

3230
SET GLOBAL query_cache_size=0;
33-
34-
--source ndbinfo_drop.inc

mysql-test/suite/ndb/t/ndbinfo_create.inc

-15
This file was deleted.

mysql-test/suite/ndb/t/ndbinfo_drop.inc

-6
This file was deleted.

mysql-test/suite/ndb/t/ndbinfo_dump.test

-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
--source include/not_embedded.inc
77
--source include/have_ndb.inc
88

9-
--source ndbinfo_create.inc
10-
119
USE ndbinfo;
1210

1311
#
@@ -22,5 +20,3 @@ select count(*) from blocks;
2220
--exec $MYSQL_DUMP --no-data --databases test ndbinfo > $dump_file
2321
--exec $MYSQL test < $dump_file
2422
select count(*) from blocks;
25-
26-
--source ndbinfo_drop.inc

mysql-test/suite/ndb/t/ndbinfo_upgrade.test

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
--source include/not_embedded.inc
22
--source include/have_ndb.inc
33

4-
--source ndbinfo_create.inc
5-
64
USE ndbinfo;
75

86
#
@@ -36,6 +34,3 @@ let $log_file = $MYSQLTEST_VARDIR/tmp/ndbinfo_upgrade_check.log;
3634

3735
# The underlying table should have been created and nodes view be readable
3836
SELECT COUNT(*) FROM nodes;
39-
40-
41-
--source ndbinfo_drop.inc

mysql-test/suite/ndb_big/rqg_spj.test

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
--source include/not_windows.inc
1111
--source include/not_embedded.inc
1212
--source suite/ndb/include/have_ndb_rqg.inc
13-
--source suite/ndb/t/ndbinfo_create.inc
1413

1514
# Remember all SPJ conters when test started.
1615
--disable_query_log
@@ -59,6 +58,5 @@ select spj_counts_at_end.counter_name,
5958
from spj_counts_at_startup, spj_counts_at_end
6059
where spj_counts_at_startup.counter_name = spj_counts_at_end.counter_name;
6160
--enable_query_log
62-
--source suite/ndb/t/ndbinfo_drop.inc
6361

6462
exit;

0 commit comments

Comments
 (0)