diff options
| author | unknown <mkindahl@dl145k.mysql.com> | 2006-07-12 08:52:47 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145k.mysql.com> | 2006-07-12 08:52:47 +0200 |
| commit | 9a111f5ccdb64a51f17b1ebc0746d87ca5eb1e56 (patch) | |
| tree | 9a773bb1f8edba658a0a7d577c176d96839d7803 /sql/sql_class.h | |
| parent | c22a89819916b66753d266376650c53c1c991811 (diff) | |
| download | mariadb-git-9a111f5ccdb64a51f17b1ebc0746d87ca5eb1e56.tar.gz | |
Post-merge fixes for mysql-5.1-new-rpl
mysql-test/r/rpl_switch_stm_row_mixed.result:
Result change
sql/sql_class.h:
Post-merge fixes.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3255e4995b9..c7a3738c076 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1201,6 +1201,7 @@ public: */ inline void force_one_auto_inc_interval(ulonglong next_id) { + auto_inc_intervals_forced.empty(); // in case of multiple SET INSERT_ID auto_inc_intervals_forced.append(next_id, ULONGLONG_MAX, 0); } @@ -1571,6 +1572,7 @@ public: #else current_stmt_binlog_row_based= FALSE; #endif + } /* Initialize the current database from a NULL-terminated string with length |