diff options
| author | istruewing@synthia.local <> | 2007-06-30 13:17:49 +0200 |
|---|---|---|
| committer | istruewing@synthia.local <> | 2007-06-30 13:17:49 +0200 |
| commit | bc3e18cd39bafa729cad013b670f1e29352ce41c (patch) | |
| tree | a177f28846ec4ce6fcf58daf42e8cec60f03306c /include/my_base.h | |
| parent | e091ce28bf48755e0d03f2d587a4956afa6e1f05 (diff) | |
| parent | c54bce13b3cbae5515efcd6d5283ac8374a7cbed (diff) | |
| download | mariadb-git-bc3e18cd39bafa729cad013b670f1e29352ce41c.tar.gz | |
Merge synthia.local:/home/mydev/mysql-5.0-axmrg
into synthia.local:/home/mydev/mysql-5.1-axmrg
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 617cdb8c3f0..503d858a41c 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() */ |