bzr commit into mysql-5.0 branch (holyfoot:2666)

[Alexey Botchkov]

#At file:///d2/hf/mysql_common/exp50/

 2666 Alexey Botchkov	2008-08-21 [merge]
      test merge - not to be pushed
modified:
  innobase/os/os0sync.c
  mysql-test/mysql-test-run.pl

=== modified file 'innobase/os/os0sync.c'
--- a/innobase/os/os0sync.c	2007-12-11 00:00:25 +0000
+++ b/innobase/os/os0sync.c	2008-08-21 17:21:32 +0000
@@ -316,6 +316,35 @@ os_event_free_internal(
 }
 
 /**************************************************************
+Frees an event object, without acquiring the global lock. */
+static
+void
+os_event_free_internal(
+/*===================*/
+	os_event_t	event)	/* in: event to free */
+{
+#ifdef __WIN__
+	ut_a(event);
+
+	ut_a(CloseHandle(event->handle));
+#else
+	ut_a(event);
+
+	/* This is to avoid freeing the mutex twice */
+	os_fast_mutex_free(&(event->os_mutex));
+
+	ut_a(0 == pthread_cond_destroy(&(event->cond_var)));
+#endif
+	/* Remove from the list of events */
+
+	UT_LIST_REMOVE(os_event_list, os_event_list, event);
+
+	os_event_count--;
+
+	ut_free(event);
+}
+
+/**************************************************************
 Frees an event object. */
 
 void

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-05-25 13:13:30 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-21 17:21:32 +0000
@@ -189,6 +189,7 @@ our $opt_force;
 our $opt_reorder= 0;
 our $opt_enable_disabled;
 our $opt_mem= $ENV{'MTR_MEM'};
+our $opt_report_features;
 
 our $opt_gcov;
 our $opt_gcov_err;