diff options
| author | tsmith@sita.local <> | 2007-07-06 17:55:46 -0600 |
|---|---|---|
| committer | tsmith@sita.local <> | 2007-07-06 17:55:46 -0600 |
| commit | 165c947e0f8e178b8e891e33585cfe428b30d410 (patch) | |
| tree | dd337dcbaf90c45f2f1bb01a82102997010bb44d /include | |
| parent | 91e406ebed66b4e0cfebff984416e73f687e4508 (diff) | |
| parent | edc4f4b3a6c346217634005ecb268e34506b5701 (diff) | |
| download | mariadb-git-165c947e0f8e178b8e891e33585cfe428b30d410.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into sita.local:/Users/tsmith/m/bk/maint/50
Diffstat (limited to 'include')
| -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 d07a4de8e6a..4ce7a87105d 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -168,7 +168,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() */ |