diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2007-03-29 17:27:42 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2007-03-29 17:27:42 +0300 |
| commit | 1c7beca65eba89f0bbd620e8fbdfaae28c0e8c97 (patch) | |
| tree | 94d5a320e9c08b8f33e5b1e51f794fe67b8c9cc7 /sql/sql_insert.cc | |
| parent | 3bd0494eb9f465e442694819ba66ae87287ce9c5 (diff) | |
| parent | 3c3b0391f89fe6deb30766ec8214fe83f5f64cef (diff) | |
| download | mariadb-git-1c7beca65eba89f0bbd620e8fbdfaae28c0e8c97.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 773383c2c2d..4eff7e4edeb 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -570,7 +570,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, if (lock_type != TL_WRITE_DELAYED && !thd->prelocked_mode) table->file->ha_start_bulk_insert(values_list.elements); - thd->no_trans_update= 0; + thd->no_trans_update.stmt= FALSE; thd->abort_on_warning= (!ignore && (thd->variables.sql_mode & (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES))); @@ -1119,7 +1119,7 @@ static int last_uniq_key(TABLE *table,uint keynr) then both on update triggers will work instead. Similarly both on delete triggers will be invoked if we will delete conflicting records. - Sets thd->no_trans_update if table which is updated didn't have + Sets thd->no_trans_update.stmt to TRUE if table which is updated didn't have transactions. RETURN VALUE @@ -1363,7 +1363,7 @@ ok_or_after_trg_err: if (key) my_safe_afree(key,table->s->max_unique_length,MAX_KEY_LENGTH); if (!table->file->has_transactions()) - thd->no_trans_update= 1; + thd->no_trans_update.stmt= TRUE; DBUG_RETURN(trg_error); err: @@ -2818,7 +2818,7 @@ void select_insert::send_error(uint errcode,const char *err) table->file->has_transactions(), FALSE); if (!thd->current_stmt_binlog_row_based && !table->s->tmp_table && !can_rollback_data()) - thd->options|= OPTION_STATUS_NO_TRANS_UPDATE; + thd->no_trans_update.all= TRUE; query_cache_invalidate3(thd, table, 1); } } @@ -2859,7 +2859,7 @@ bool select_insert::send_eof() */ if (!trans_table && (!table->s->tmp_table || !thd->current_stmt_binlog_row_based)) - thd->options|= OPTION_STATUS_NO_TRANS_UPDATE; + thd->no_trans_update.all= TRUE; } /* @@ -3166,7 +3166,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE); if (!thd->prelocked_mode) table->file->ha_start_bulk_insert((ha_rows) 0); - thd->no_trans_update= 0; + thd->no_trans_update.stmt= FALSE; thd->abort_on_warning= (!info.ignore && (thd->variables.sql_mode & (MODE_STRICT_TRANS_TABLES | |