diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
| commit | 5a00a868b74ffb6b220eb72c87ec38696ce9406c (patch) | |
| tree | 76a673d7a9b20f184988993cc14ce455b1d73f70 /sql/sql_help.cc | |
| parent | 436c7714dd6df991f2e968b313906d4b1e70db97 (diff) | |
| parent | c9497e2365461fb2547a8cfceb33b68a99d7fe0b (diff) | |
| download | mariadb-git-5a00a868b74ffb6b220eb72c87ec38696ce9406c.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
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 33bf4c481a2..52548803984 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -618,6 +618,7 @@ bool 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"; @@ -646,7 +647,7 @@ bool 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))) goto error; |