diff options
| author | antony@ppcg5.local <> | 2007-07-06 09:03:50 -0700 |
|---|---|---|
| committer | antony@ppcg5.local <> | 2007-07-06 09:03:50 -0700 |
| commit | 6402e4324a5d38a8d3249a8cb8058ff89c24b879 (patch) | |
| tree | 66c5419689570123e5a89f3071167d75adc70483 /include/my_base.h | |
| parent | 0a1c65b6e3fe1f3cec4aa8a6cea0dd4acb51887a (diff) | |
| parent | 53043d6f45bc24a6713d7565ae4292faefe8a397 (diff) | |
| download | mariadb-git-6402e4324a5d38a8d3249a8cb8058ff89c24b879.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-engines.merge
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 bb5fdfc8392..bbc0c0f1f5c 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() */ |