diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
| commit | 75730fb37e4a730df1dca83da9c8ff63c7122491 (patch) | |
| tree | eff9942a59480da2e462c761af70d6bde1a856fc /sql/sql_help.cc | |
| parent | dc25de58e58bf64c82e290b5c625fb68caa82953 (diff) | |
| parent | 9aa459f0df7e000224e4ac54c5009eac42ef365a (diff) | |
| download | mariadb-git-75730fb37e4a730df1dca83da9c8ff63c7122491.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index cba74c93a6a..53533c12fc5 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -619,6 +619,7 @@ int mysqld_help(THD *thd, const char *mask) st_find_field used_fields[array_elements(init_used_fields)]; DBUG_ENTER("mysqld_help"); + TABLE_LIST *leaves= 0; TABLE_LIST tables[4]; bzero((gptr)tables,sizeof(tables)); tables[0].alias= tables[0].real_name= (char*) "help_topic"; @@ -647,7 +648,7 @@ int mysqld_help(THD *thd, const char *mask) tables do not contain VIEWs => we can pass 0 as conds */ - setup_tables(thd, tables, 0); + setup_tables(thd, tables, 0, &leaves, 0); memcpy((char*) used_fields, (char*) init_used_fields, sizeof(used_fields)); if (init_fields(thd, tables, used_fields, array_elements(used_fields))) { |