summaryrefslogtreecommitdiff
path: root/mysys/my_alloc.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-06-06 20:41:52 +0300
committerunknown <monty@mysql.com>2005-06-06 20:41:52 +0300
commit9595c788f9857d0e712f6659d3a0d85300aa0f7b (patch)
tree17b738558f52110891f2e7512fe70f70ae16ea5e /mysys/my_alloc.c
parenta0682cac4763061d34e4659da8a27866624e6f5b (diff)
downloadmariadb-git-9595c788f9857d0e712f6659d3a0d85300aa0f7b.tar.gz
Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error mysql-test/r/auto_increment.result: New tests for auto-increment and replace mysql-test/r/innodb.result: New tests for auto-increment and replace mysql-test/t/auto_increment.test: New tests for auto-increment and replace mysql-test/t/innodb.test: New tests for auto-increment and replace mysys/my_alloc.c: More comments
Diffstat (limited to 'mysys/my_alloc.c')
-rw-r--r--mysys/my_alloc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index 072fc09cd12..4aa31829c59 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -262,6 +262,7 @@ static inline void mark_blocks_free(MEM_ROOT* root)
NOTES
One can call this function either with root block initialised with
init_alloc_root() or with a bzero()-ed block.
+ It's also safe to call this multiple times with the same mem_root.
*/
void free_root(MEM_ROOT *root, myf MyFlags)