diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-02 09:50:17 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-02 09:50:17 +0300 |
| commit | 5985c1274169c1c6cc0c800a0af833887097d7fc (patch) | |
| tree | 126f183c3ed6c3a2efc2449b8eae04de14d75688 /sql/sql_insert.cc | |
| parent | 1eec03a39b1f60b37404021f1637557c290066c8 (diff) | |
| download | mariadb-git-5985c1274169c1c6cc0c800a0af833887097d7fc.tar.gz | |
postmerge changes
mysql-test/t/lowercase_view.test:
error code changed after merege
mysql-test/t/view.test:
error code changed after merege
sql/item.cc:
inline function used instead of frequently used expression
removed old TODO
sql/sql_base.cc:
layoutfixed
inline function used instead of frequently used expression
sql/sql_insert.cc:
inline function used instead of frequently used expression
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 43a23dd31f0..9421cc4bb6b 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1195,9 +1195,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, bool view= FALSE; if (table_list) { - table_list= (table_list->belong_to_view ? - table_list->belong_to_view : - table_list); + table_list= table_list->top_table(); view= test(table_list->view); } if (view) |