compilation error fix

parent 237374c4
--disable_query_log --disable_query_log
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'archive'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'archive';
--enable_query_log --enable_query_log
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'blackhole'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'blackhole';
enable_query_log; enable_query_log;
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'csv'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'csv';
enable_query_log; enable_query_log;
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'example'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'example';
enable_query_log; enable_query_log;
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'federated'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'federated';
enable_query_log; enable_query_log;
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'innodb';
enable_query_log; enable_query_log;
...@@ -10,7 +10,7 @@ drop table if exists t1, t2; ...@@ -10,7 +10,7 @@ drop table if exists t1, t2;
--enable_warnings --enable_warnings
flush tables; flush tables;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log; enable_query_log;
# Check that server2 has NDB support # Check that server2 has NDB support
...@@ -21,7 +21,7 @@ drop table if exists t1, t2; ...@@ -21,7 +21,7 @@ drop table if exists t1, t2;
--enable_warnings --enable_warnings
flush tables; flush tables;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log; enable_query_log;
# Check should be here as well... # Check should be here as well...
......
# Check that server is compiled and started with support for NDB # Check that server is compiled and started with support for NDB
disable_query_log; disable_query_log;
--require r/true.require --require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log; enable_query_log;
......
...@@ -1400,7 +1400,7 @@ VIEWS information_schema.VIEWS 1 ...@@ -1400,7 +1400,7 @@ VIEWS information_schema.VIEWS 1
End of 5.0 tests. End of 5.0 tests.
select * from information_schema.engines WHERE ENGINE="MyISAM"; select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM ENABLED Default engine as of MySQL 3.23 with great performance NO NO NO MyISAM DEFAULT Default engine as of MySQL 3.23 with great performance NO NO NO
grant select on *.* to user3148@localhost; grant select on *.* to user3148@localhost;
select user,db from information_schema.processlist; select user,db from information_schema.processlist;
user db user db
......
...@@ -3259,6 +3259,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin, ...@@ -3259,6 +3259,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin,
handlerton *hton= plugin_data(plugin, handlerton *); handlerton *hton= plugin_data(plugin, handlerton *);
const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS; const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
CHARSET_INFO *scs= system_charset_info; CHARSET_INFO *scs= system_charset_info;
handlerton *default_type= ha_default_handlerton(thd);
DBUG_ENTER("iter_schema_engines"); DBUG_ENTER("iter_schema_engines");
if (!(hton->flags & HTON_HIDDEN)) if (!(hton->flags & HTON_HIDDEN))
...@@ -3274,8 +3275,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin, ...@@ -3274,8 +3275,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin,
restore_record(table, s->default_values); restore_record(table, s->default_values);
table->field[0]->store(name->str, name->length, scs); table->field[0]->store(name->str, name->length, scs);
if (hton->state == SHOW_OPTION_YES && if (hton->state == SHOW_OPTION_YES && default_type == hton)
hton == thd->variables.table_type)
option_name= "DEFAULT"; option_name= "DEFAULT";
table->field[1]->store(option_name, strlen(option_name), scs); table->field[1]->store(option_name, strlen(option_name), scs);
table->field[2]->store(plugin_decl(plugin)->descr, table->field[2]->store(plugin_decl(plugin)->descr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment