summaryrefslogtreecommitdiff
path: root/include/my_base.h
diff options
context:
space:
mode:
authorunknown <antony@ppcg5.local>2007-06-29 13:55:16 -0700
committerunknown <antony@ppcg5.local>2007-06-29 13:55:16 -0700
commitb4fe5e4408dad197509976857bb7826d8c447ce0 (patch)
tree844544d6c708c2f900915ec09dfa5f2c34a64c53 /include/my_base.h
parent94beb7cd8db07e816ecced8112945d9df9db67e4 (diff)
downloadmariadb-git-b4fe5e4408dad197509976857bb7826d8c447ce0.tar.gz
add and amend comments for clarity
include/my_base.h: amend comment for clarity sql/ha_federated.cc: add comment
Diffstat (limited to 'include/my_base.h')
-rw-r--r--include/my_base.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h
index a26217f8050..4ce7a87105d 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -170,9 +170,8 @@ enum ha_extra_function {
HA_EXTRA_DELETE_CANNOT_BATCH,
HA_EXTRA_UPDATE_CANNOT_BATCH,
/*
- Inform handler that write_row() should immediately report constraint
- violations because a INSERT...ON DUPLICATE KEY UPDATE is in being
- performed.
+ 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
};