List:Internals« Previous MessageNext Message »
From:Heikki Tuuri Date:June 17 2004 1:05pm
Subject:bk commit into 4.0 tree (heikki:1.1877)
View as plain text  
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.1877 04/06/17 16:05:19 heikki@stripped +2 -0
  que0que.c, srv0que.c:
    Put asserts that make sure srv_que_task_enqueue() is never called under MySQL

  innobase/que/que0que.c
    1.21 04/06/17 16:04:30 heikki@stripped +4 -0
    Put asserts that make sure srv_que_task_enqueu() is never called under MySQL

  innobase/srv/srv0que.c
    1.2 04/06/17 16:01:16 heikki@stripped +2 -0
    Put asserts that make sure srv_que_task_enqueu() is never called under MySQL

# 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.1/innobase/srv/srv0que.c	Thu Jun 17 12:34:37 2004
+++ 1.2/innobase/srv/srv0que.c	Thu Jun 17 16:01:16 2004
@@ -103,6 +103,8 @@
 {
 	ut_ad(thr);
 
+	ut_a(0);	/* Under MySQL this is never called */
+
 	mutex_enter(&kernel_mutex);
 	
 	srv_que_task_enqueue_low(thr);

--- 1.20/innobase/que/que0que.c	Thu Jun 17 13:34:10 2004
+++ 1.21/innobase/que/que0que.c	Thu Jun 17 16:04:30 2004
@@ -214,6 +214,7 @@
 	if (next_thr && *next_thr == NULL) {
 		*next_thr = thr;
 	} else {
+		ut_a(0);
 		srv_que_task_enqueue_low(thr);
 	}
 }	
@@ -394,6 +395,7 @@
 	
 	que_thr_move_to_run_state(thr);
 
+	ut_a(0);
 	srv_que_task_enqueue_low(thr);
 }
 
@@ -804,6 +806,7 @@
 			if (next_thr && *next_thr == NULL) {
 				*next_thr = thr;
 			} else {
+				ut_a(0);
 				srv_que_task_enqueue_low(thr);
 			}
 
@@ -1257,6 +1260,7 @@
 	loop_count++;
 
 	if (next_thr != thr) {
+		ut_a(next_thr == NULL);
 		que_thr_dec_refer_count(thr, &next_thr);
 
 		if (next_thr == NULL) {
Thread
bk commit into 4.0 tree (heikki:1.1877)Heikki Tuuri17 Jun