Merge lp:~vkolesnikov/pbxt/pbxt-bug-509218 into lp:pbxt

[Vladimir Kolesnikov]

=== modified file 'ChangeLog'
--- ChangeLog	2010-01-11 10:57:15 +0000
+++ ChangeLog	2010-01-19 16:02:14 +0000
@@ -1,6 +1,8 @@
 PBXT Release Notes
 ==================
 
+RN299: Fixed bug #509218: Server asserts with Assertion `mutex->__data.__owner == 0' failed on high concurrency OLTP test.
+
 ------- 1.0.10d RC4 - 2010-01-11
 
 RN298: Fixed a bug that caused huge amounts of transaction log to be written when pbxt_flush_log_at_trx_commit = 2.
 
=== modified file 'src/thread_xt.cc'
--- src/thread_xt.cc	2010-01-11 12:57:16 +0000
+++ src/thread_xt.cc	2010-01-19 16:02:14 +0000
@@ -1168,6 +1168,14 @@
 	/* Align the number of threads: */
 	xt_thr_maximum_threads = xt_align_size(max_threads, XT_XS_LOCK_ALIGN);
 
+#ifdef XT_TRACK_CONNECTIONS
+	if (xt_thr_maximum_threads > XT_TRACK_MAX_CONNS) {
+		xt_log_error(XT_NS_CONTEXT, XT_LOG_FATAL, XT_ERR_TOO_MANY_THREADS, 0, 
+			"XT_TRACK_CONNECTIONS is enabled and xt_thr_maximum_threads > XT_TRACK_MAX_CONNS");
+		goto failed;
+	}
+#endif
+
 #ifdef HANDLE_SIGNALS
 	if (!thr_setup_signals())
 		return NULL;
 
=== modified file 'src/trace_xt.h'
--- src/trace_xt.h	2009-05-04 14:39:21 +0000
+++ src/trace_xt.h	2010-01-19 16:02:14 +0000
@@ -51,7 +51,9 @@
  * CONNECTION TRACKING
  */
 
+#ifdef DEBUG
 #define XT_TRACK_CONNECTIONS
+#endif
 
 #ifdef XT_TRACK_CONNECTIONS
 #define XT_TRACK_MAX_CONNS		500