Skip to content

Commit

Permalink
MDEV-16342 SHOW ENGINES: MyISAM description is useless
Browse files Browse the repository at this point in the history
rewrite tautological engine descriptions
  • Loading branch information
vuvova committed Jun 11, 2018
1 parent 1d43f71 commit e7ca377
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mysql-test/r/information_schema.result
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ USE test;
End of 5.0 tests.
select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM DEFAULT MyISAM storage engine NO NO NO
MyISAM DEFAULT Non-transactional engine with good performance and small data footprint NO NO NO
grant select on *.* to user3148@localhost;
select user,db from information_schema.processlist;
user db
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/federated/have_federatedx.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if (!`SELECT count(*) FROM information_schema.plugins WHERE
plugin_name = 'federated' AND plugin_status = 'active' AND
plugin_description LIKE '%FederatedX%'`){
plugin_description LIKE '%transactions%'`){
skip Need FederatedX engine;
}
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/is_engines_archive.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'ARCHIVE';
ENGINE ARCHIVE
SUPPORT YES
COMMENT Archive storage engine
COMMENT gzip-compresses tables for a low storage footprint
TRANSACTIONS NO
XA NO
SAVEPOINTS NO
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/is_engines_csv.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'CSV';
ENGINE CSV
SUPPORT YES
COMMENT CSV storage engine
COMMENT Stores tables as CSV files
TRANSACTIONS NO
XA NO
SAVEPOINTS NO
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/is_engines_federated.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'FEDERATED';
ENGINE FEDERATED
SUPPORT YES
COMMENT FederatedX pluggable storage engine
COMMENT Allows to access tables on other MariaDB servers, supports transactions and more
TRANSACTIONS YES
XA NO
SAVEPOINTS YES
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/is_engines_myisam.result
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'MyISAM';
ENGINE MyISAM
SUPPORT DEFAULT
COMMENT MyISAM storage engine
COMMENT Non-transactional engine with good performance and small data footprint
TRANSACTIONS NO
XA NO
SAVEPOINTS NO
2 changes: 1 addition & 1 deletion storage/archive/ha_archive.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,7 @@ maria_declare_plugin(archive)
&archive_storage_engine,
"ARCHIVE",
"Brian Aker, MySQL AB",
"Archive storage engine",
"gzip-compresses tables for a low storage footprint",
PLUGIN_LICENSE_GPL,
archive_db_init, /* Plugin Init */
archive_db_done, /* Plugin Deinit */
Expand Down
2 changes: 1 addition & 1 deletion storage/csv/ha_tina.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ maria_declare_plugin(csv)
&csv_storage_engine,
"CSV",
"Brian Aker, MySQL AB",
"CSV storage engine",
"Stores tables as CSV files",
PLUGIN_LICENSE_GPL,
tina_init_func, /* Plugin Init */
tina_done_func, /* Plugin Deinit */
Expand Down
2 changes: 1 addition & 1 deletion storage/federated/ha_federated.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,7 @@ maria_declare_plugin(federated)
&federated_storage_engine,
"FEDERATED",
"Patrick Galbraith and Brian Aker, MySQL AB",
"Federated MySQL storage engine",
"Allows to access tables on other MariaDB servers",
PLUGIN_LICENSE_GPL,
federated_db_init, /* Plugin Init */
federated_done, /* Plugin Deinit */
Expand Down
2 changes: 1 addition & 1 deletion storage/federatedx/ha_federatedx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3608,7 +3608,7 @@ maria_declare_plugin(federatedx)
&federatedx_storage_engine,
"FEDERATED",
"Patrick Galbraith",
"FederatedX pluggable storage engine",
"Allows to access tables on other MariaDB servers, supports transactions and more",
PLUGIN_LICENSE_GPL,
federatedx_db_init, /* Plugin Init */
federatedx_done, /* Plugin Deinit */
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/ha_myisam.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2346,7 +2346,7 @@ maria_declare_plugin(myisam)
&myisam_storage_engine,
"MyISAM",
"MySQL AB",
"MyISAM storage engine",
"Non-transactional engine with good performance and small data footprint",
PLUGIN_LICENSE_GPL,
myisam_init, /* Plugin Init */
NULL, /* Plugin Deinit */
Expand Down

0 comments on commit e7ca377

Please sign in to comment.