summaryrefslogtreecommitdiff
path: root/sql/sql_sequence.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2017-10-19 13:22:38 +0300
committerMichael Widenius <monty@mariadb.org>2017-10-19 13:25:02 +0300
commit211f9eea60100f05dea197ac2b55119ebb57c481 (patch)
tree4c45f3d6870c811d2ad574652814cda6bcf8dfcf /sql/sql_sequence.h
parente156db85a75b2a15b89ebc5f65eedb07e0574420 (diff)
downloadmariadb-git-211f9eea60100f05dea197ac2b55119ebb57c481.tar.gz
MDEV-14092 NEXTVAL fails on slave
The problem was that the code in replication didn't distinguish between a setval() failing because the stored sequence number was bigger than the current (should have been ignored) and a failure from the storage engine.
Diffstat (limited to 'sql/sql_sequence.h')
-rw-r--r--sql/sql_sequence.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_sequence.h b/sql/sql_sequence.h
index b61e4ffe40d..2d609d8591b 100644
--- a/sql/sql_sequence.h
+++ b/sql/sql_sequence.h
@@ -105,8 +105,8 @@ public:
all_values_used= 0;
}
longlong next_value(TABLE *table, bool second_round, int *error);
- bool set_value(TABLE *table, longlong next_value, ulonglong round_arg,
- bool is_used);
+ int set_value(TABLE *table, longlong next_value, ulonglong round_arg,
+ bool is_used);
longlong increment_value(longlong value)
{
if (real_increment > 0)