diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
| commit | 1e3886ae80c44a39ec3e4061b4ea3131cdcef213 (patch) | |
| tree | ce95518792d1432b669ba13a248928e74e81a9bb /sql/sql_sequence.h | |
| parent | 0fe7d8a2a221196d977e5efe3f3dedb22806bb53 (diff) | |
| parent | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (diff) | |
| download | mariadb-git-1e3886ae80c44a39ec3e4061b4ea3131cdcef213.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_sequence.h')
| -rw-r--r-- | sql/sql_sequence.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_sequence.h b/sql/sql_sequence.h index b560d03ca52..1dc777657d5 100644 --- a/sql/sql_sequence.h +++ b/sql/sql_sequence.h @@ -88,7 +88,8 @@ protected: class SEQUENCE :public sequence_definition { public: - enum seq_init { SEQ_UNINTIALIZED, SEQ_IN_PREPARE, SEQ_READY_TO_USE }; + enum seq_init { SEQ_UNINTIALIZED, SEQ_IN_PREPARE, SEQ_IN_ALTER, + SEQ_READY_TO_USE }; SEQUENCE(); ~SEQUENCE(); int read_initial_values(TABLE *table); @@ -101,6 +102,7 @@ public: { sequence_definition::operator= (*seq); adjust_values(reserved_until); + 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, |