database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-26 01:44:06 +03:00
Code Activity

Merge synthia.local:/home/mydev/mysql-5.0-axmrg

Browse Source 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@synthia.local
2007-06-30 13:17:49 +02:00
parent e091ce28bf c54bce13b3
commit bc3e18cd39
9 changed files with 549 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/my_base.h
View File

@@ -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() */