database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

compilation error fix

Browse Source
This commit is contained in:
gluh@mysql.com/eagle.(none)
2007-06-09 16:05:43 +05:00
parent 237374c457
commit 70e7487db3
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/have_archive.inc
View File

@ -1,4 +1,4 @@
--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

2
mysql-test/include/have_blackhole.inc
View File

@ -1,4 +1,4 @@
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;

2
mysql-test/include/have_csv.inc
View File

@ -1,4 +1,4 @@
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;

2
mysql-test/include/have_exampledb.inc
View File

@ -1,4 +1,4 @@
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;

2
mysql-test/include/have_federated_db.inc
View File

@ -1,4 +1,4 @@
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;

2
mysql-test/include/have_innodb.inc
View File

@ -1,4 +1,4 @@
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;

4
mysql-test/include/have_multi_ndb.inc
View File

@ -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;
--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...

2
mysql-test/include/have_ndb.inc
View File

@ -1,7 +1,7 @@
# 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;

2
mysql-test/r/information_schema.result
View File

@ -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

4
sql/sql_show.cc
View File

@ -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,
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,