List:Commits« Previous MessageNext Message »
From:marko.makela Date:November 11 2010 1:18pm
Subject:bzr push into mysql-5.5-innodb branch (marko.makela:3225 to 3226)
View as plain text  
 3226 Marko Mäkelä	2010-11-11 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/thr/thr0loc.c
 3225 Vasil Dimov	2010-11-11 [merge]
      Merge mysql-5.1-innodb -> mysql-5.5-innodb

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/include/dict0dict.h
=== modified file 'storage/innobase/thr/thr0loc.c'
--- a/storage/innobase/thr/thr0loc.c	revid:vasil.dimov@strippedi
+++ b/storage/innobase/thr/thr0loc.c	revid:marko.makela@oracle.com-20101111131352-lhr1065yg9o902fk
@@ -87,7 +87,8 @@ thr_local_validate(
 	const thr_local_t*	local)	/*!< in: data to validate */
 {
 	ut_ad(local->magic_n == THR_LOCAL_MAGIC_N);
-	ut_ad(local->slot_no < OS_THREAD_MAX_N);
+	ut_ad(local->slot_no == ULINT_UNDEFINED
+	      || local->slot_no < OS_THREAD_MAX_N);
 	ut_ad(local->in_ibuf == FALSE || local->in_ibuf == TRUE);
 	return(TRUE);
 }
@@ -211,7 +212,7 @@ thr_local_create(void)
 	local->id = os_thread_get_curr_id();
 	local->handle = os_thread_get_curr();
 	local->magic_n = THR_LOCAL_MAGIC_N;
-
+	local->slot_no = ULINT_UNDEFINED;
 	local->in_ibuf = FALSE;
 
 	mutex_enter(&thr_local_mutex);

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101111131352-lhr1065yg9o902fk.bundle
Thread
bzr push into mysql-5.5-innodb branch (marko.makela:3225 to 3226) marko.makela11 Nov