diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-24 15:22:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-24 15:22:33 +0200 |
| commit | 967c1b04c0cfedbb618083ac0874602fd67ed954 (patch) | |
| tree | decaf5525533d4b56d277f4507959de40b717e13 /include | |
| parent | 25e911fa5e6ae6389231bffd6e64f9bd292aa3bc (diff) | |
| parent | 78cf07c8ea126fc03706988de23893ca4680ac77 (diff) | |
| download | mariadb-git-967c1b04c0cfedbb618083ac0874602fd67ed954.tar.gz | |
merge
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index 5ab84fb3433..1fbdd0539a8 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -88,7 +88,9 @@ enum ha_extra_function { HA_EXTRA_FORCE_REOPEN=21, /* Datafile have changed on disk */ HA_EXTRA_FLUSH, /* Flush tables to disk */ HA_EXTRA_NO_ROWS, /* Don't write rows */ - HA_EXTRA_RESET_STATE /* Reset positions */ + HA_EXTRA_RESET_STATE, /* Reset positions */ + HA_EXTRA_IGNORE_DUP_KEY, /* Dup keys don't rollback everything*/ + HA_EXTRA_NO_IGNORE_DUP_KEY }; /* The following is parameter to ha_panic() */ |