Skip to content

Commit 4159e6a

Browse files
committed
WL#7575 Remove ndbinfo's usage of other engine
- improve comments
1 parent c94c236 commit 4159e6a

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

mysql-test/suite/ndb/r/ndbinfo.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ drop view frag_ops;
12971297
drop table t1;
12981298
drop table t2;
12991299

1300-
## Check the new tables return data and exists.
1300+
## Check that the new tables return data and exists.
13011301
select count(*) > 10 from ndb$blocks;
13021302
count(*) > 10
13031303
1
@@ -1311,7 +1311,7 @@ type_id type_name
13111311
2 User table
13121312
select * from ndb$dbtc_apiconnect_state;
13131313
select * from ndb$dblqh_tcconnect_state;
1314-
## Check the new views return data and exists.
1314+
## Check that the new views return data and exists.
13151315
select block_number from blocks where block_name = "DBTC";
13161316
block_number
13171317
245

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ drop table t2;
686686
# - three new views was added to preserve backwards compatibility
687687
# for those tabes which was changed to prefix ndb$
688688

689-
## Check the new tables return data and exists.
689+
## Check that the new tables return data and exists.
690690
select count(*) > 10 from ndb$blocks;
691691
select param_number, param_name from ndb$config_params
692692
where param_name = "DataMemory";
@@ -696,7 +696,7 @@ select * from ndb$dbtc_apiconnect_state;
696696
select * from ndb$dblqh_tcconnect_state;
697697
--enable_result_log
698698

699-
## Check the new views return data and exists.
699+
## Check that the new views return data and exists.
700700
select block_number from blocks where block_name = "DBTC";
701701
select param_name from config_params where param_number = 101;
702702
select type_name from ndb$dict_obj_types where type_id = 3;

storage/ndb/tools/ndbinfo_sql.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,12 @@ struct view {
367367
"ON name.parent_obj_id=parent_name.id AND "
368368
"name.parent_obj_type=parent_name.type"
369369
},
370+
// The blocks, dict_obj_types and config_params used
371+
// to be stored in a different engine but have now
372+
// been folded into hardcoded ndbinfo tables whose
373+
// name include the special prefix.
374+
// These views are defined to provide backward compatibility
375+
// for code using the old names.
370376
{ "blocks",
371377
"SELECT block_number, block_name "
372378
"FROM `<NDBINFO_DB>`.`<TABLE_PREFIX>blocks`"

0 commit comments

Comments
 (0)