mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
merge
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_class.h: Auto merged sql/sql_delete.cc: 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_view.h: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
commit
3bc1fcd409
51 changed files with 1256 additions and 268 deletions
|
|
@ -575,6 +575,7 @@ db_show_routine_status(THD *thd, int type, const char *wild)
|
|||
Item *item;
|
||||
List<Item> field_list;
|
||||
struct st_used_field *used_field;
|
||||
TABLE_LIST *leaves= 0;
|
||||
st_used_field used_fields[array_elements(init_fields)];
|
||||
|
||||
memcpy((char*) used_fields, (char*) init_fields, sizeof(used_fields));
|
||||
|
|
@ -607,7 +608,7 @@ db_show_routine_status(THD *thd, int type, const char *wild)
|
|||
|
||||
tables is not VIEW for sure => we can pass 0 as condition
|
||||
*/
|
||||
setup_tables(thd, &tables, 0);
|
||||
setup_tables(thd, &tables, 0, &leaves, 0);
|
||||
for (used_field= &used_fields[0];
|
||||
used_field->field_name;
|
||||
used_field++)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue