Fixes for Netware

Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL

1 files changed, 3 insertions, 28 deletions

diff --git a/sql/slave.h b/sql/slave.h
index 72ddcd8b471..ea7e2b4ef16 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -103,7 +103,7 @@ typedef struct st_relay_log_info
     created temporary tables. Modified only on init/end and by the SQL
     thread, read only by SQL thread.
   */
-  TABLE* save_temporary_tables;
+  TABLE *save_temporary_tables;
 
   /*
     standard lock acquistion order to avoid deadlocks:
@@ -171,33 +171,8 @@ typedef struct st_relay_log_info
   bool skip_log_purge;
   bool inside_transaction;
 
-  st_relay_log_info()
-    :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0),
-  slave_run_id(0), inited(0), abort_slave(0), slave_running(0),
-  log_pos_current(0), skip_log_purge(0),
-  inside_transaction(0) /* the default is autocommit=1 */
-  {
-    relay_log_name[0] = master_log_name[0] = 0;
-    bzero(&info_file,sizeof(info_file));
-    bzero(&cache_buf, sizeof(cache_buf));
-    pthread_mutex_init(&run_lock, MY_MUTEX_INIT_FAST);
-    pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
-    pthread_mutex_init(&log_space_lock, MY_MUTEX_INIT_FAST);
-    pthread_cond_init(&data_cond, NULL);
-    pthread_cond_init(&start_cond, NULL);
-    pthread_cond_init(&stop_cond, NULL);
-    pthread_cond_init(&log_space_cond, NULL);
-  }
-  ~st_relay_log_info()
-  {
-     pthread_mutex_destroy(&run_lock);
-     pthread_mutex_destroy(&data_lock);
-     pthread_mutex_destroy(&log_space_lock);
-     pthread_cond_destroy(&data_cond);
-     pthread_cond_destroy(&start_cond);
-     pthread_cond_destroy(&stop_cond);
-     pthread_cond_destroy(&log_space_cond);
-   }
+  st_relay_log_info();
+  ~st_relay_log_info();
   inline void inc_pending(ulonglong val)
   {
     pending += val;