bk commit into 4.0 tree (1.1472)

Below is the list of changes that have just been committed into a local
4.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1472 03/04/24 23:03:00 heikki@xxxxxxxxxxxxxxx +1 -0
  srv0srv.c:
    Make sure we do not do insert buffer merge in fast shutdown even if there 
is some buglet which increments srv_activity_counter during a shutdown

  innobase/srv/srv0srv.c
    1.41 03/04/24 23:02:52 heikki@xxxxxxxxxxxxxxx +5 -5
    Make sure we do not do insert buffer merge in fast shutdown even if there 
is some buglet which increments srv_activity_counter during a shutdown

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: heikki
# Host: hundin.mysql.fi
# Root: /home/heikki/mysql-4.0

--- 1.40/innobase/srv/srv0srv.c Thu Apr 24 21:50:40 2003
+++ 1.41/innobase/srv/srv0srv.c Thu Apr 24 23:02:52 2003
@@ -2802,6 +2802,11 @@
                        goto suspend_thread;
                }
 
+               if (srv_fast_shutdown && srv_shutdown_state > 0) {
+
+                       goto background_loop;
+               }
+
                /* We flush the log once in a second even if no commit
                is issued or the we have specified in my.cnf no flush
                at transaction commit */
@@ -2828,11 +2833,6 @@
                                                (char*)"flushing log";
                        log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
                        log_flush_to_disk();
-               }
-               
-               if (srv_fast_shutdown && srv_shutdown_state > 0) {
-
-                       goto background_loop;
                }
 
                if (srv_activity_count == old_activity_count) {

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx