Skip to content

Commit ad6cc18

Browse files
committed
BUG#16533802: START SLAVE FAILS WITH TABLE REPOSITORY AND AUTOCOMMIT = 0
Fix for BUG 16533802 included changes on clean_info() method from info tables management, after BUG 17286858 (CHANGE_MASTER() INVOKES HA_INNOBASE::TRUNCATE() IN A DML TRANSACTION) fix those changes are not needed anymore, so this patch removes the unneeded changes.
1 parent 1e23a29 commit ad6cc18

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

sql/rpl_info_table.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ int Rpl_info_table::do_clean_info()
290290
/*
291291
Unlocks and closes the rpl_info table.
292292
*/
293-
access->close_table(thd, table, &backup, error, true);
293+
access->close_table(thd, table, &backup, error);
294294
reenable_binlog(thd);
295295
thd->variables.sql_mode= saved_mode;
296296
access->drop_thd(thd);

sql/rpl_info_table_access.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ bool Rpl_info_table_access::open_table(THD* thd, const LEX_STRING dbstr,
130130
@param[in] backup Restore the lock info from here
131131
@param[in] error If there was an error while updating
132132
the table
133-
@param[in] force_commit force "real" commit (with ha_commit_trans()
134-
all parameter set to TRUE)
135133
136134
If there is an error, rolls back the current statement. Otherwise,
137135
commits it. However, if a new thread was created and there is an
@@ -146,7 +144,7 @@ bool Rpl_info_table_access::open_table(THD* thd, const LEX_STRING dbstr,
146144
*/
147145
bool Rpl_info_table_access::close_table(THD *thd, TABLE* table,
148146
Open_tables_backup *backup,
149-
bool error, bool force_commit)
147+
bool error)
150148
{
151149
Query_tables_list query_tables_list_backup;
152150

@@ -164,7 +162,7 @@ bool Rpl_info_table_access::close_table(THD *thd, TABLE* table,
164162
*/
165163
ha_commit_trans(thd, FALSE, TRUE);
166164
}
167-
if (saved_current_thd != current_thd || force_commit)
165+
if (saved_current_thd != current_thd)
168166
{
169167
if (error)
170168
ha_rollback_trans(thd, TRUE);

sql/rpl_info_table_access.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Rpl_info_table_access
3535
uint max_num_field, enum thr_lock_type lock_type,
3636
TABLE** table, Open_tables_backup* backup);
3737
bool close_table(THD* thd, TABLE* table, Open_tables_backup* backup,
38-
bool error, bool force_commit= false);
38+
bool error);
3939
enum enum_return_id find_info(Rpl_info_values *field_values, TABLE *table);
4040
enum enum_return_id scan_info(TABLE *table, uint instance);
4141
bool count_info(TABLE *table, uint* counter);

0 commit comments

Comments
 (0)