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

Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb

Browse Source 
into  dator5.(none):/home/pappa/push_clone


sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
This commit is contained in:
unknown
2006-08-31 16:45:46 -04:00
parent 72df0b3e30 ab72c34747
commit c8e4fe09b0
17 changed files with 405 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@ -5149,7 +5149,7 @@ static my_bool run_hton_fill_schema_files(THD *thd, st_plugin_int *plugin,
struct run_hton_fill_schema_files_args *args=
(run_hton_fill_schema_files_args *) arg;
handlerton *hton= (handlerton *)plugin->data;
if(hton->fill_files_table)
if(hton->fill_files_table && hton->state == SHOW_OPTION_YES)
hton->fill_files_table(thd, args->tables, args->cond);
return false;
}