1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge mysql.com:/home/ram/work/b29420/b29420.5.0

into  mysql.com:/home/ram/work/b29420/b29420.5.1


sql/sql_repl.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged
This commit is contained in:
unknown
2007-07-07 12:04:11 +05:00
3 changed files with 23 additions and 5 deletions

View File

@@ -1442,13 +1442,11 @@ err:
}
if (errmsg)
{
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW BINLOG EVENTS", errmsg);
DBUG_RETURN(TRUE);
}
else
send_eof(thd);
send_eof(thd);
pthread_mutex_lock(&LOCK_thread_count);
thd->current_linfo = 0;
pthread_mutex_unlock(&LOCK_thread_count);