Added detection if pthread_attr_getstacksize() exists

Fixed bug in RAND() usage in mysqlbinlog

9 files changed, 12 insertions, 11 deletions

diff --git a/configure.in b/configure.in
index b5cf42a7a2e..56a3dbd8bd1 100644
--- a/configure.in
+++ b/configure.in
@@ -1796,6 +1796,7 @@ AC_CHECK_FUNCS(alarm bmove \
  sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np \
  pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \
  pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
+ pthread_attr_getstacksize \
  pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
  fchmod getpass getpassphrase initgroups mlockall)
 
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 7459849cb04..6650d25e145 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -43,8 +43,8 @@ enum thr_lock_type { TL_IGNORE=-1,
 		      */
 		     TL_WRITE_ALLOW_WRITE,
 		     /*
-			Write lock, but allow other threads to read / write.
-			Used by ALTER TABLE in MySQL to mark to allow readers
+			Write lock, but allow other threads to read.
+			Used by ALTER TABLE in MySQL to allow readers
 			to use the table until ALTER TABLE is finished.
 		     */
 		     TL_WRITE_ALLOW_READ,
diff --git a/sql/log_event.cc b/sql/log_event.cc
index e243a953c63..645ac8076df 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -972,14 +972,14 @@ int Rand_log_event::write_data(IO_CACHE* file)
 #ifdef MYSQL_CLIENT
 void Rand_log_event::print(FILE* file, bool short_form, char* last_db)
 {
-  char llbuff[22];
+  char llbuff[22],llbuff2[22];
   if (!short_form)
   {
     print_header(file);
     fprintf(file, "\tRand\n");
   }
   fprintf(file, "SET @@RAND_SEED1=%s, @@RAND_SEED2=%s;\n",
-	  llstr(seed1, llbuff),llstr(seed2, llbuff));
+	  llstr(seed1, llbuff),llstr(seed2, llbuff2));
   fflush(file);
 }
 #endif
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 72d3295dad4..2e47312f588 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2099,6 +2099,7 @@ int main(int argc, char **argv)
   (void) pthread_attr_setdetachstate(&connection_attrib,
 				     PTHREAD_CREATE_DETACHED);
   pthread_attr_setstacksize(&connection_attrib,thread_stack);
+#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
   {
     /* Retrieve used stack size;  Needed for checking stack overflows */
     size_t stack_size;
@@ -2110,6 +2111,7 @@ int main(int argc, char **argv)
       thread_stack= stack_size;
     }
   }
+#endif
   if (!(opt_specialflag & SPECIAL_NO_PRIOR))
     my_pthread_attr_setprio(&connection_attrib,WAIT_PRIOR);
   pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM);
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index cbb30cafdc4..e263ca7adeb 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -57,13 +57,13 @@ static int init_failsafe_rpl_thread(THD* thd)
 {
   DBUG_ENTER("init_failsafe_rpl_thread");
   thd->system_thread = thd->bootstrap = 1;
+  thd->host_or_ip= "";
   thd->client_capabilities = 0;
   my_net_init(&thd->net, 0);
   thd->net.read_timeout = slave_net_timeout;
   thd->max_client_packet_length=thd->net.max_packet;
   thd->master_access= ~0;
   thd->priv_user = 0;
-  thd->system_thread = 1;
   pthread_mutex_lock(&LOCK_thread_count);
   thd->thread_id = thread_id++;
   pthread_mutex_unlock(&LOCK_thread_count);
diff --git a/sql/slave.cc b/sql/slave.cc
index 64d54be113e..efab5b4c6b9 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1783,6 +1783,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
 {
   DBUG_ENTER("init_slave_thread");
   thd->system_thread = thd->bootstrap = 1;
+  thd->host_or_ip= "";
   thd->client_capabilities = 0;
   my_net_init(&thd->net, 0);
   thd->net.read_timeout = slave_net_timeout;
@@ -1790,7 +1791,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
   thd->priv_user = 0;
   thd->slave_thread = 1;
   thd->options = (((opt_log_slave_updates) ? OPTION_BIN_LOG:0) | OPTION_AUTO_IS_NULL) ;
-  thd->system_thread = 1;
   thd->client_capabilities = CLIENT_LOCAL_FILES;
   thd->real_id=pthread_self();
   pthread_mutex_lock(&LOCK_thread_count);
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 727807415da..e5ba58a0543 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -83,7 +83,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
 	   global_read_lock(0),bootstrap(0)
 {
   host=user=priv_user=db=query=ip=0;
-  host_or_ip="unknown ip";
+  host_or_ip= "connecting host";
   locked=killed=count_cuted_fields=some_tables_deleted=no_errors=password=
     query_start_used=safe_to_cache_query=0;
   db_length=query_length=col_access=0;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 23563239558..32071e5b083 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -535,6 +535,7 @@ public:
 
     bzero((char*) &thd.net,sizeof(thd.net));	// Safety
     thd.system_thread=1;
+    thd.host_or_ip= "";
     bzero((char*) &info,sizeof(info));
     pthread_mutex_init(&mutex,MY_MUTEX_INIT_FAST);
     pthread_cond_init(&cond,NULL);
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 4fca236b165..bf553113d53 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1059,10 +1059,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
         thd_info->user=thd->strdup(tmp->user ? tmp->user :
 				   (tmp->system_thread ?
 				    "system user" : "unauthenticated user"));
-        thd_info->host=thd->strdup(tmp->host ? tmp->host :
-				   (tmp->ip ? tmp->ip :
-				    (tmp->system_thread ? "none" :
-				     "connecting host")));
+        thd_info->host= thd->strdup(tmp->host_or_ip);
         if ((thd_info->db=tmp->db))             // Safe test
           thd_info->db=thd->strdup(thd_info->db);
         thd_info->command=(int) tmp->command;