diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2eb3826ebee..29063a7212f 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6036,7 +6036,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values, ulonglong *first_value, ulonglong *nb_reserved_values) -{ +{ int cache_size; Uint64 auto_value; DBUG_ENTER("get_auto_increment"); @@ -6060,7 +6060,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment, Ndb_tuple_id_range_guard g(m_share); if (m_skip_auto_increment && ndb->readAutoIncrementValue(m_table, g.range, auto_value) || - ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size)) + ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset)) { if (--retries && ndb->getNdbError().status == NdbError::TemporaryError); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 16d7ef79f74..cfa05673754 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1158,13 +1158,14 @@ void clean_up(bool print_message) if (cleanup_done++) return; /* purecov: inspected */ - logger.cleanup_base(); - /* make sure that handlers finish up what they have that is dependent on the binlog */ ha_binlog_end(current_thd); + + logger.cleanup_base(); + injector::free_instance(); mysql_bin_log.cleanup(); |