diff options
| author | antony@anubis.xiphis.org <> | 2007-07-01 20:56:47 -0700 |
|---|---|---|
| committer | antony@anubis.xiphis.org <> | 2007-07-01 20:56:47 -0700 |
| commit | 673a8708d1fea6ff0e90486c097921a7bfefbe91 (patch) | |
| tree | 6c799762f4eee5f91022c1ef1ecf42df0e8867a7 /include/my_base.h | |
| parent | 2efac2246325f48efdfe08076c68774bab1c2616 (diff) | |
| parent | 754f66cf56bed2004e347e46084cdb7126cfbf99 (diff) | |
| download | mariadb-git-673a8708d1fea6ff0e90486c097921a7bfefbe91.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
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() */ |