Commit fa52873b authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 

into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
parents d0482fee 3b8e73fb

mysql-test/r/flush2.result

0 → 100644
+24 −0
Original line number Diff line number Diff line 
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;

mysql-test/t/disabled.def

+2 −0
Original line number Diff line number Diff line
@@ -12,3 +12,5 @@ 


ndb_load        : Bug#17233

user_limits     : Bug#23921 random failure of user_limits.test

flush2          : Bug#24805 Pushbuild can't handle test with --disable-log-bin

mysql-test/t/flush2-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--disable-log-bin

mysql-test/t/flush2.test

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# 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;

sql/sql_parse.cc

+8 −3
Original line number Diff line number Diff line
@@ -4040,8 +4040,9 @@ mysql_execute_command(THD *thd) 
  case SQLCOM_FLUSH:

  {

    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;



    /*

      reload_acl_and_cache() will tell us if we are allowed to write to the

      binlog or not.
@@ -4063,6 +4064,7 @@ mysql_execute_command(THD *thd) 
      }

      send_ok(thd);

    } 

    

    break;

  }

  case SQLCOM_KILL:
@@ -6732,7 +6734,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, 
    tmp_write_to_binlog= 0;

    mysql_log.new_file(1);

    mysql_slow_log.new_file(1);

    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);