diff options
| author | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
| commit | f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0 (patch) | |
| tree | 9baffd6140dc110806fd9c5531adf2e4f85fb6d0 /include | |
| parent | 5ac016a8147602703aae069c076e6b75a3ab5723 (diff) | |
| parent | 685ccf85d40b39e690e99ef735ce202c876468c3 (diff) | |
| download | mariadb-git-f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_update.cc:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index 076eed9998f..05ba38e77eb 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -152,7 +152,16 @@ enum ha_extra_function { other fields intact. When this is off (by default) InnoDB will use memcpy to overwrite entire row. */ - HA_EXTRA_KEYREAD_PRESERVE_FIELDS + HA_EXTRA_KEYREAD_PRESERVE_FIELDS, + /* + Informs handler that write_row() which tries to insert new row into the + table and encounters some already existing row with same primary/unique + key can replace old row with new row instead of reporting error (basically + it informs handler that we do REPLACE instead of simple INSERT). + Off by default. + */ + HA_EXTRA_WRITE_CAN_REPLACE, + HA_EXTRA_WRITE_CANNOT_REPLACE }; /* The following is parameter to ha_panic() */ |