build break cleanup

include/config-win.h

@@ -411,16 +411,7 @@ inline double ulonglong2double(ulonglong value)
 #ifdef __NT__  /* This should also work on Win98 but .. */
 #define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C))
 #define thread_safe_sub(V,C,L) InterlockedExchangeAdd((long*) &(V),-(long) (C))
-#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
-#else
-#define thread_safe_add(V,C,L) \
-	pthread_mutex_lock((L)); (V)+=(C); pthread_mutex_unlock((L));
-#define thread_safe_sub(V,C,L) \
-	pthread_mutex_lock((L)); (V)-=(C); pthread_mutex_unlock((L));
-#define statistic_add(V,C,L)	 (V)+=(C)
 #endif
-#define statistic_increment(V,L) thread_safe_increment((V),(L))
-#define statistic_decrement(V,L) thread_safe_decrement((V),(L))
 
 #define shared_memory_buffer_length 16000
 #define default_shared_memory_base_name "MYSQL"

include/my_pthread.h

@@ -722,17 +722,25 @@ extern uint thd_lib_detected;
   Warning:
   When compiling without threads, this file is not included.
   See the *other* declarations of thread_safe_xxx in include/my_global.h
+
+  Second warning:
+  See include/config-win.h, for yet another implementation.
 */
 #ifdef THREAD
+#ifndef thread_safe_increment
 #define thread_safe_increment(V,L) \
         (pthread_mutex_lock((L)), (V)++, pthread_mutex_unlock((L)))
 #define thread_safe_decrement(V,L) \
         (pthread_mutex_lock((L)), (V)--, pthread_mutex_unlock((L)))
+#endif
+
+#ifndef thread_safe_add
 #define thread_safe_add(V,C,L) \
         (pthread_mutex_lock((L)), (V)+=(C), pthread_mutex_unlock((L)))
 #define thread_safe_sub(V,C,L) \
         (pthread_mutex_lock((L)), (V)-=(C), pthread_mutex_unlock((L)))
 #endif
+#endif
 
 /*
   statistics_xxx functions are for non critical statistic,

sql/event_queue.cc

@@ -73,16 +73,14 @@ Event_queue::Event_queue()
   :next_activation_at(0),
    mutex_last_locked_at_line(0),
    mutex_last_unlocked_at_line(0),
+   mutex_last_attempted_lock_at_line(0),
    mutex_last_locked_in_func("n/a"),
    mutex_last_unlocked_in_func("n/a"),
    mutex_last_attempted_lock_in_func("n/a"),
-   mutex_last_attempted_lock_at_line(0),
    mutex_queue_data_locked(FALSE),
-   mutex_queue_data_attempting_lock(FALSE)
+   mutex_queue_data_attempting_lock(FALSE),
+   waiting_on_cond(FALSE)
 {
-  mutex_last_unlocked_in_func= mutex_last_locked_in_func=
-    mutex_last_attempted_lock_in_func= "";
-
   pthread_mutex_init(&LOCK_event_queue, MY_MUTEX_INIT_FAST);
   pthread_cond_init(&COND_queue_state, NULL);
 }

tests/mysql_client_test.c

@@ -16080,7 +16080,6 @@ static void test_bug24179()
 static void test_bug28075()
 {
   int rc;
-  MYSQL_STMT *stmt;
 
   DBUG_ENTER("test_bug28075");
   myheader("test_bug28075");