diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:23:13 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:23:13 +0200 |
| commit | f88d01932f4a81682267e21022686d3dea4edb78 (patch) | |
| tree | b6370530d805ecddad3284428883cac10256f774 /sql/sp.cc | |
| parent | 5a00a868b74ffb6b220eb72c87ec38696ce9406c (diff) | |
| download | mariadb-git-f88d01932f4a81682267e21022686d3dea4edb78.tar.gz | |
post-merge fix
mysql-test/r/view.result:
changes in error number, and key in view processing
mysql-test/t/view.test:
changes in error number, and key in view processing
sql/mysql_priv.h:
changes functions
sql/sp.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_base.cc:
fixed finding table, taking in account join view, which can have not TABLE pointer
now we report to setup_tables(), are we setuping SELECT...INSERT and ennumerete insert table separately
sql/sql_delete.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_help.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_insert.cc:
fixed returning value of functions
sql/sql_load.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
removed second setup_tables call (merge)
sql/sql_olap.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_parse.cc:
UPDATE->MULTIUPDATE switching fixed
sql/sql_prepare.cc:
UPDATE->MULTIUPDATE switching fixed
sql/sql_select.cc:
now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_update.cc:
UPDATE->MULTIUPDATE switching fixed
sql/sql_view.cc:
returning value fixed
sql/sql_view.h:
returning value fixed
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 3b3a307c859..41ce3552292 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -608,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, &leaves, 0); + setup_tables(thd, &tables, 0, &leaves, FALSE, FALSE); for (used_field= &used_fields[0]; used_field->field_name; used_field++) |