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/sql_view.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/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index ca9faddb07a..38ab3a3db9f 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -489,6 +489,7 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, tbl= tbl->next_local) { if ((tbl->view && !tbl->updatable_view) || tbl->schema_table) + { view->updatable_view= 0; break; } @@ -1074,18 +1075,18 @@ bool check_key_in_view(THD *thd, TABLE_LIST *view) view view for processing RETURN - 0 - OK - -1 - error (is not sent to cliet) + FALSE OK + TRUE error (is not sent to cliet) */ -int insert_view_fields(List<Item> *list, TABLE_LIST *view) +bool insert_view_fields(List<Item> *list, TABLE_LIST *view) { uint elements_in_view= view->view->select_lex.item_list.elements; Field_translator *trans; DBUG_ENTER("insert_view_fields"); if (!(trans= view->field_translation)) - DBUG_RETURN(0); + DBUG_RETURN(FALSE); for (uint i= 0; i < elements_in_view; i++) { @@ -1095,10 +1096,10 @@ int insert_view_fields(List<Item> *list, TABLE_LIST *view) else { my_error(ER_NON_UPDATABLE_TABLE, MYF(0), view->alias, "INSERT"); - DBUG_RETURN(-1); + DBUG_RETURN(TRUE); } } - DBUG_RETURN(0); + DBUG_RETURN(FALSE); } /* |