diff options
| author | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
| commit | 2b53b711d8c36fadf3ce123a678795876fb67be4 (patch) | |
| tree | 47cfdff5ea22001b614037779ee931abbc209636 /sql/sp.cc | |
| parent | c9415c77b5ce586b4134b91a92447fe175c4e7b2 (diff) | |
| parent | 7517d7e11298da9ce9aaea8e2e42c25a640d5be9 (diff) | |
| download | mariadb-git-2b53b711d8c36fadf3ce123a678795876fb67be4.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486-merge
mysql-test/r/errors.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/fulltext_order_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/errors.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/fulltext_order_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
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_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_insert.cc:
merge WL#2486
sql/sql_show.cc:
merge WL#2486
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 5dd7c613a10..a46ebca3fa7 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -789,6 +789,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); for (used_field= &used_fields[0]; used_field->field_name; @@ -798,7 +799,7 @@ db_show_routine_status(THD *thd, int type, const char *wild) "mysql", "proc", used_field->field_name); if (!field || - !(used_field->field= find_field_in_tables(thd, field, &tables, + !(used_field->field= find_field_in_tables(thd, field, &tables, NULL, 0, REPORT_ALL_ERRORS, 1, TRUE))) { |