diff options
| author | unknown <serg@serg.mysql.com> | 2000-12-24 15:34:30 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-12-24 15:34:30 +0100 |
| commit | c0965de3f377e0a5ee215fe7f0dd662da251e412 (patch) | |
| tree | 22024ba7b1714d46b951b0c219c2fbce024768e7 /include | |
| parent | 885517089a42a51a1f1eed716743eeba1d23aba7 (diff) | |
| parent | 740f328ebb70794c6e65bc7d19b325454d200558 (diff) | |
| download | mariadb-git-c0965de3f377e0a5ee215fe7f0dd662da251e412.tar.gz | |
Merge
include/raid.h:
merged
sql/sql_show.cc:
merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 | ||||
| -rw-r--r-- | include/raid.h | 1 |
2 files changed, 3 insertions, 2 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() */ diff --git a/include/raid.h b/include/raid.h index 4048448260d..d5c130f6060 100644 --- a/include/raid.h +++ b/include/raid.h @@ -92,7 +92,6 @@ extern "C" { int my_raid_close(File, myf MyFlags); int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags); - #ifdef __cplusplus } |