database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge naruto.:C:/cpp/bug17733/my51-bug17733

Browse Source 
into  naruto.:C:/cpp/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2006-12-04 14:34:56 +01:00
parent 7043524c57 9060123496
commit a57037e314
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@@ -4221,6 +4221,7 @@ end_with_restore_list:
bool write_to_binlog;
if (check_global_access(thd,RELOAD_ACL))
goto error;
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
@@ -4241,7 +4242,8 @@ end_with_restore_list:
}
}
send_ok(thd);
}
}
break;
}
case SQLCOM_KILL:
@@ -6966,7 +6968,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
than it would help them)
*/
tmp_write_to_binlog= 0;
mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
if( mysql_bin_log.is_open() )
{
mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
}
#ifdef HAVE_REPLICATION
pthread_mutex_lock(&LOCK_active_mi);
rotate_relay_log(active_mi);