MDEV-33092 Undefined reference to concurrency on Solaris

remove thr_setconcurrency()
followup for 8bbcaab1

Fix by Rainer Orth

cmake/os/WindowsCache.cmake

@@ -243,7 +243,6 @@ SET(HAVE_TERMCAP_H CACHE  INTERNAL "")
 SET(HAVE_TERMIOS_H CACHE  INTERNAL "")
 SET(HAVE_TERMIO_H CACHE  INTERNAL "")
 SET(HAVE_TERM_H CACHE  INTERNAL "")
-SET(HAVE_THR_SETCONCURRENCY CACHE  INTERNAL "")
 SET(HAVE_THR_YIELD CACHE  INTERNAL "")
 SET(HAVE_TIME 1 CACHE  INTERNAL "")
 SET(HAVE_TIMES CACHE  INTERNAL "")

config.h.cmake

@@ -231,7 +231,6 @@
 #cmakedefine HAVE_STRTOUL 1
 #cmakedefine HAVE_STRTOULL 1
 #cmakedefine HAVE_TELL 1
-#cmakedefine HAVE_THR_SETCONCURRENCY 1
 #cmakedefine HAVE_THR_YIELD 1
 #cmakedefine HAVE_TIME 1
 #cmakedefine HAVE_TIMES 1

configure.cmake

@@ -417,7 +417,6 @@ CHECK_FUNCTION_EXISTS (strtoul HAVE_STRTOUL)
 CHECK_FUNCTION_EXISTS (strtoull HAVE_STRTOULL)
 CHECK_FUNCTION_EXISTS (strcasecmp HAVE_STRCASECMP)
 CHECK_FUNCTION_EXISTS (tell HAVE_TELL)
-CHECK_FUNCTION_EXISTS (thr_setconcurrency HAVE_THR_SETCONCURRENCY)
 CHECK_FUNCTION_EXISTS (thr_yield HAVE_THR_YIELD)
 CHECK_FUNCTION_EXISTS (vasprintf HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)

include/my_pthread.h

@@ -148,9 +148,6 @@ int pthread_cancel(pthread_t thread);
 #ifndef _REENTRANT
 #define _REENTRANT
 #endif
-#ifdef HAVE_THR_SETCONCURRENCY
-#include <thread.h>			/* Probably solaris */
-#endif
 #ifdef HAVE_SCHED_H
 #include <sched.h>
 #endif
@@ -619,9 +616,6 @@ extern int my_rw_trywrlock(my_rw_lock_t *);
 
 #define GETHOSTBYADDR_BUFF_SIZE 2048
 
-#ifndef HAVE_THR_SETCONCURRENCY
-#define thr_setconcurrency(A) pthread_dummy(0)
-#endif
 #if !defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && ! defined(pthread_attr_setstacksize)
 #define pthread_attr_setstacksize(A,B) pthread_dummy(0)
 #endif

libmysqld/lib_sql.cc

@@ -635,8 +635,6 @@ int init_embedded_server(int argc, char **argv, char **groups)
     udf_init();
 #endif
 
-  (void) thr_setconcurrency(concurrency);	// 10 by default
-
   if (flush_time && flush_time != ~(ulong) 0L)
     start_handle_manager();
 

mysys/thr_alarm.c

@@ -786,7 +786,6 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
   mysql_mutex_unlock(&LOCK_thread_count);
   DBUG_PRINT("info",("signal thread created"));
 
-  thr_setconcurrency(3);
   pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
   printf("Main thread: %s\n",my_thread_name());
   for (i=0 ; i < 2 ; i++)

mysys/thr_lock.c

@@ -1783,9 +1783,6 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
 	    error,errno);
     exit(1);
   }
-#endif
-#ifdef HAVE_THR_SETCONCURRENCY
-  (void) thr_setconcurrency(2);
 #endif
   for (i=0 ; i < array_elements(lock_counts) ; i++)
   {

mysys/thr_timer.c

@@ -533,7 +533,6 @@ static void run_test()
   mysql_mutex_init(0, &LOCK_thread_count, MY_MUTEX_INIT_FAST);
   mysql_cond_init(0, &COND_thread_count, NULL);
 
-  thr_setconcurrency(3);
   pthread_attr_init(&thr_attr);
   pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
   printf("Main thread: %s\n",my_thread_name());

sql/mysqld.cc

@@ -5490,8 +5490,6 @@ int mysqld_main(int argc, char **argv)
     SYSVAR_AUTOSIZE(my_thread_stack_size, new_thread_stack_size);
   }
 
-  (void) thr_setconcurrency(concurrency);	// 10 by default
-
   select_thread=pthread_self();
   select_thread_in_use=1;
 

storage/maria/unittest/ma_pagecache_consist.c

@@ -403,10 +403,6 @@ int main(int argc __attribute__((unused)),
     exit(1);
   }
 
-#ifdef HAVE_THR_SETCONCURRENCY
-  thr_setconcurrency(2);
-#endif
-
   if ((pagen= init_pagecache(&pagecache, PCACHE_SIZE, 0, 0,
                              TEST_PAGE_SIZE, 0, 0)) == 0)
   {

storage/maria/unittest/ma_pagecache_rwconsist.c

@@ -272,10 +272,6 @@ int main(int argc __attribute__((unused)),
     exit(1);
   }
 
-#ifdef HAVE_THR_SETCONCURRENCY
-  thr_setconcurrency(2);
-#endif
-
   if ((pagen= init_pagecache(&pagecache, PCACHE_SIZE, 0, 0,
                              TEST_PAGE_SIZE, 0, 0)) == 0)
   {

storage/maria/unittest/ma_pagecache_rwconsist2.c

@@ -268,10 +268,6 @@ int main(int argc __attribute__((unused)),
     exit(1);
   }
 
-#ifdef HAVE_THR_SETCONCURRENCY
-  thr_setconcurrency(2);
-#endif
-
   if ((pagen= init_pagecache(&pagecache, PCACHE_SIZE, 0, 0,
                              TEST_PAGE_SIZE, 0, 0)) == 0)
   {

storage/maria/unittest/ma_pagecache_single.c

@@ -795,10 +795,6 @@ int main(int argc __attribute__((unused)),
     exit(1);
   }
 
-#ifdef HAVE_THR_SETCONCURRENCY
-  thr_setconcurrency(2);
-#endif
-
   if ((pagen= init_pagecache(&pagecache, PCACHE_SIZE, 0, 0,
                              TEST_PAGE_SIZE, 0, MYF(MY_WME))) == 0)
   {

storage/maria/unittest/ma_test_loghandler_multithread-t.c

@@ -331,10 +331,6 @@ int main(int argc __attribute__((unused)),
     exit(1);
   }
 
-#ifdef HAVE_THR_SETCONCURRENCY
-  thr_setconcurrency(2);
-#endif
-
   if (ma_control_file_open(TRUE, TRUE, TRUE))
   {
     fprintf(stderr, "Can't init control file (%d)\n", errno);