From b5f5cb7c6cec573a3666a39e9b23d36c83eced78 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Mar 2005 10:38:25 +0100 Subject: bug#8151 - truncate leaves a transaction open deadlock in MYSQL_LOG::new_file() style fixes mysql-test/r/innodb.result: one more test for truncate mysql-test/t/innodb.test: one more test for truncate sql/ha_innodb.cc: bug#8151 - truncate leaves a transaction open sql/handler.cc: bug#8151 - truncate leaves a transaction open sql/item.h: style fix sql/item_cmpfunc.cc: style fix sql/item_cmpfunc.h: style fix sql/item_func.cc: style fix sql/item_func.h: style fix sql/log.cc: let new_file() to lock LOCK_index, don't check for prepared_xids in rotate_and_purge() increase thread_safe_increment when LOCK_log is taken sql/log_event.cc: mysqlbinlog now prints a warning if binlog was not closed properly sql/sql_class.h: comments sql/sql_repl.cc: DBUG_ENTER tag corrected --- sql/sql_repl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_repl.cc') diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 3b4e822a3df..b3c963f5f03 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1271,7 +1271,7 @@ int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, bool mysql_show_binlog_events(THD* thd) { Protocol *protocol= thd->protocol; - DBUG_ENTER("show_binlog_events"); + DBUG_ENTER("mysql_show_binlog_events"); List field_list; const char *errmsg = 0; IO_CACHE log; -- cgit v1.2.1