diff options
| author | unknown <antony@anubis.xiphis.org> | 2007-07-01 20:56:47 -0700 |
|---|---|---|
| committer | unknown <antony@anubis.xiphis.org> | 2007-07-01 20:56:47 -0700 |
| commit | 218ae8f3b1aefc807e670dd144fe78ce6266147b (patch) | |
| tree | 6c799762f4eee5f91022c1ef1ecf42df0e8867a7 /include/my_base.h | |
| parent | de0ba5c894df8f86512d025f4196d62687efb1bb (diff) | |
| parent | 1cd1f7d06fdd6099d8e3378aed1f42bdfbd8c415 (diff) | |
| download | mariadb-git-218ae8f3b1aefc807e670dd144fe78ce6266147b.tar.gz | |
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-merge
include/my_base.h:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index b2a8b4b6b67..9a2b374a866 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -180,7 +180,12 @@ enum ha_extra_function { These flags are reset by the handler::extra(HA_EXTRA_RESET) call. */ HA_EXTRA_DELETE_CANNOT_BATCH, - HA_EXTRA_UPDATE_CANNOT_BATCH + HA_EXTRA_UPDATE_CANNOT_BATCH, + /* + Inform handler that an "INSERT...ON DUPLICATE KEY UPDATE" will be + executed. This condition is unset by HA_EXTRA_NO_IGNORE_DUP_KEY. + */ + HA_EXTRA_INSERT_WITH_UPDATE }; /* The following is parameter to ha_panic() */ |