database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

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


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2006-12-04 14:43:34 +01:00
parent 65da49e6a8 e284256ef0
commit 9b86f2a48a
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/r/flush2.result Normal file
View File

@ -0,0 +1,24 @@
flush logs;
set global expire_logs_days = 3;
show variables like 'log%';
Variable_name Value
log ON
log_bin OFF
log_bin_trust_function_creators ON
log_error
log_queries_not_using_indexes OFF
log_slave_updates OFF
log_slow_queries OFF
log_warnings 1
flush logs;
show variables like 'log%';
Variable_name Value
log ON
log_bin OFF
log_bin_trust_function_creators ON
log_error
log_queries_not_using_indexes OFF
log_slave_updates OFF
log_slow_queries OFF
log_warnings 1
set global expire_logs_days = 0;

1
mysql-test/t/flush2-master.opt Normal file
View File

@ -0,0 +1 @@
--disable-log-bin

9
mysql-test/t/flush2.test Normal file
View File

@ -0,0 +1,9 @@
#
# Bug#17733 Flushing logs causes daily server crash
#
flush logs;
set global expire_logs_days = 3;
show variables like 'log%';
flush logs;
show variables like 'log%';
set global expire_logs_days = 0;

11
sql/sql_parse.cc
View File

@ -4040,8 +4040,9 @@ end_with_restore_list:
case SQLCOM_FLUSH: case SQLCOM_FLUSH:
{ {
bool write_to_binlog; bool write_to_binlog;
if (check_global_access(thd,RELOAD_ACL) || check_db_used(thd, all_tables)) if (check_global_access(thd,RELOAD_ACL))
goto error; goto error;
/* /*
reload_acl_and_cache() will tell us if we are allowed to write to the reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not. binlog or not.
@ -4062,7 +4063,8 @@ end_with_restore_list:
} }
} }
send_ok(thd); send_ok(thd);
} }
break; break;
} }
case SQLCOM_KILL: case SQLCOM_KILL:
@ -6732,7 +6734,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
tmp_write_to_binlog= 0; tmp_write_to_binlog= 0;
mysql_log.new_file(1); mysql_log.new_file(1);
mysql_slow_log.new_file(1); mysql_slow_log.new_file(1);
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 #ifdef HAVE_REPLICATION
pthread_mutex_lock(&LOCK_active_mi); pthread_mutex_lock(&LOCK_active_mi);
rotate_relay_log(active_mi); rotate_relay_log(active_mi);