diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
| commit | bf541d14f29a589c01989d4da2540283f7f9d66f (patch) | |
| tree | 74fe704d2ae83b58d06940ffcf7a36638868fee0 /sql/sql_insert.cc | |
| parent | 0a1832268d84af51622699bedd8e2fd34c79f308 (diff) | |
| parent | 8f9e655dab1802d31be5c01ea5b5e9ccee01363c (diff) | |
| download | mariadb-git-bf541d14f29a589c01989d4da2540283f7f9d66f.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.cc:
Manual merge
sql/item.cc:
Manual merge
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index f9dbd402de7..c2b1990f6c7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -619,7 +619,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, if (mysql_prepare_insert(thd, table_list, table, fields, values, update_fields, update_values, duplic, &unused_conds, FALSE, - (fields.elements || !value_count), + (fields.elements || !value_count || + table_list->view != 0), !ignore && (thd->variables.sql_mode & (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES)))) @@ -1862,7 +1863,6 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list) { if (!(di= new Delayed_insert())) { - my_error(ER_OUTOFMEMORY,MYF(0),sizeof(Delayed_insert)); thd->fatal_error(); goto end_create; } |