diff options
| author | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
| commit | c46fb742b82d9e894fc8ec92ec18b804af48b1b2 (patch) | |
| tree | 8e3365da0e05942d80e6e6ae092f7e0e40832fe2 /sql/sp.cc | |
| parent | b615e0b6dca974678ea6f9610f42ed4dbeb1bfe5 (diff) | |
| parent | 74cc73d4619c94ceb1b93725b1bba7b802f2290d (diff) | |
| download | mariadb-git-c46fb742b82d9e894fc8ec92ec18b804af48b1b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 0e81e627f71..653c04ee11a 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -137,6 +137,7 @@ TABLE *open_proc_table_for_read(THD *thd, Open_tables_state *backup) mysql_proc_table_exists= 0; DBUG_RETURN(0); } + table->use_all_columns(); DBUG_ASSERT(table->s->system_table); @@ -182,6 +183,8 @@ static TABLE *open_proc_table_for_update(THD *thd) tables.lock_type= TL_WRITE; table= open_ltable(thd, &tables, TL_WRITE); + if (table) + table->use_all_columns(); /* Under explicit LOCK TABLES or in prelocked mode we should not @@ -801,6 +804,7 @@ db_show_routine_status(THD *thd, int type, const char *wild) TABLE_LIST *leaves= 0; st_used_field used_fields[array_elements(init_fields)]; + table->use_all_columns(); memcpy((char*) used_fields, (char*) init_fields, sizeof(used_fields)); /* Init header */ for (used_field= &used_fields[0]; @@ -834,7 +838,7 @@ db_show_routine_status(THD *thd, int type, const char *wild) thd->lex->select_lex.context.resolve_in_table_list_only(&tables); setup_tables(thd, &thd->lex->select_lex.context, &thd->lex->select_lex.top_join_list, - &tables, 0, &leaves, FALSE); + &tables, &leaves, FALSE); for (used_field= &used_fields[0]; used_field->field_name; used_field++) |