diff options
| author | unknown <istruewing@synthia.local> | 2007-06-30 13:17:49 +0200 |
|---|---|---|
| committer | unknown <istruewing@synthia.local> | 2007-06-30 13:17:49 +0200 |
| commit | 6b1250587727a5b157432971529bf7895590d6a8 (patch) | |
| tree | a177f28846ec4ce6fcf58daf42e8cec60f03306c /include/my_base.h | |
| parent | 241088c53f2f962dcfb5632ec916f9631faf7843 (diff) | |
| parent | ffe19f62eb20c672d0982c80347d80533c4cc0bc (diff) | |
| download | mariadb-git-6b1250587727a5b157432971529bf7895590d6a8.tar.gz | |
Merge synthia.local:/home/mydev/mysql-5.0-axmrg
into synthia.local:/home/mydev/mysql-5.1-axmrg
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
include/my_base.h:
Manual merge
sql/sql_insert.cc:
Manual merge
storage/federated/ha_federated.cc:
Manual merge
storage/federated/ha_federated.h:
Manual 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 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() */ |