1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #58699 cannot build with gcc dbg on solaris

Browse Source 
cmake/os/SunOS.cmake:
  Remove TARGET_OS_SOLARIS
config.h.cmake:
  Remove TARGET_OS_SOLARIS
  Add PTHREAD_ONCE_INITIALIZER
configure.cmake:
  Add function for testing whether we need { PTHREAD_ONCE_INIT } rather than PTHREAD_ONCE_INIT
include/my_pthread.h:
  Use PTHREAD_ONCE_INITIALIZER if set by cmake.
include/mysql/psi/mysql_file.h:
  Include my_global.h first, to get correct platform definitions.
mysys/ptr_cmp.c:
  Hide the unused static functions in #ifdef's on solaris.
  Use __sun (defined by both gcc and SunPro cc) rather than TARGET_OS_SOLARIS
sql/my_decimal.cc:
  Include my_global.h first, to get correct platform definitions.
sql/mysqld.cc:
  Fix signed/unsigned comparison warning.
sql/sql_audit.h:
  Include my_global.h first, to get correct platform definitions.
sql/sql_plugin.h:
  Include my_global.h first, to get correct platform definitions.
sql/sql_show.cc:
  Fix: warning: cast from pointer to integer of different size
sql/sys_vars.h:
  Use reinterpret_cast rather than c-style cast.
storage/perfschema/pfs_instr.cc:
  Include my_global.h first, to get correct platform definitions.
This commit is contained in:
Tor Didriksen 2010-12-21 13:00:26 +01:00
parent 3dcdd6957a
commit 029a5df870
13 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/os/SunOS.cmake
View File

@ -17,7 +17,6 @@ INCLUDE(CheckSymbolExists)
INCLUDE(CheckCSourceRuns)
INCLUDE(CheckCSourceCompiles)
SET(TARGET_OS_SOLARIS 1)
# Enable 64 bit file offsets
SET(_FILE_OFFSET_BITS 64)

2
config.h.cmake
View File

@ -226,6 +226,7 @@
#cmakedefine HAVE_PTHREAD_THREADMASK 1
#cmakedefine HAVE_PTHREAD_YIELD_NP 1
#cmakedefine HAVE_PTHREAD_YIELD_ZERO_ARG 1
#cmakedefine PTHREAD_ONCE_INITIALIZER @PTHREAD_ONCE_INITIALIZER@
#cmakedefine HAVE_PUTENV 1
#cmakedefine HAVE_RE_COMP 1
#cmakedefine HAVE_REGCOMP 1
@ -406,7 +407,6 @@
#cmakedefine TARGET_OS_LINUX 1
#cmakedefine TARGET_OS_SOLARIS 1
#cmakedefine HAVE_WCTYPE_H 1
#cmakedefine HAVE_WCHAR_H 1

43
configure.cmake
View File

@ -269,6 +269,49 @@ ENDIF()
#
FIND_PACKAGE (Threads)
FUNCTION(MY_CHECK_PTHREAD_ONCE_INIT)
CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
IF(NOT HAVE_WERROR_FLAG)
RETURN()
ENDIF()
SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
CHECK_C_SOURCE_COMPILES("
#include <pthread.h>
void foo(void) {}
int main()
{
pthread_once_t once_control = PTHREAD_ONCE_INIT;
pthread_once(&once_control, foo);
return 0;
}"
HAVE_PTHREAD_ONCE_INIT
)
# http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6611808
IF(NOT HAVE_PTHREAD_ONCE_INIT)
CHECK_C_SOURCE_COMPILES("
#include <pthread.h>
void foo(void) {}
int main()
{
pthread_once_t once_control = { PTHREAD_ONCE_INIT };
pthread_once(&once_control, foo);
return 0;
}"
HAVE_ARRAY_PTHREAD_ONCE_INIT
)
ENDIF()
IF(HAVE_PTHREAD_ONCE_INIT)
SET(PTHREAD_ONCE_INITIALIZER "PTHREAD_ONCE_INIT" PARENT_SCOPE)
ENDIF()
IF(HAVE_ARRAY_PTHREAD_ONCE_INIT)
SET(PTHREAD_ONCE_INITIALIZER "{ PTHREAD_ONCE_INIT }" PARENT_SCOPE)
ENDIF()
ENDFUNCTION()
IF(CMAKE_USE_PTHREADS_INIT)
MY_CHECK_PTHREAD_ONCE_INIT()
ENDIF()
#
# Tests for functions
#

4
include/my_pthread.h
View File

@ -214,7 +214,11 @@ int pthread_cancel(pthread_t thread);
typedef void *(* pthread_handler)(void *);
#define my_pthread_once_t pthread_once_t
#if defined(PTHREAD_ONCE_INITIALIZER)
#define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INITIALIZER
#else
#define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
#endif
#define my_pthread_once(C,F) pthread_once(C,F)
/* Test first for RTS or FSU threads */

2
include/mysql/psi/mysql_file.h
View File

@ -16,6 +16,8 @@
#ifndef MYSQL_FILE_H
#define MYSQL_FILE_H
#include <my_global.h>
/* For strlen() */
#include <string.h>
/* For MY_STAT */

21
mysys/ptr_cmp.c
View File

@ -22,7 +22,7 @@
#include "mysys_priv.h"
#include <myisampack.h>
#ifdef TARGET_OS_SOLARIS
#ifdef __sun
/*
* On Solaris, memcmp() is normally faster than the unrolled ptr_compare_N
* functions, as memcmp() is usually a platform-specific implementation
@ -39,22 +39,25 @@ static int native_compare(size_t *length, unsigned char **a, unsigned char **b)
return memcmp(*a, *b, *length);
}
#else /* TARGET_OS_SOLARIS */
#else /* __sun */
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_0(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_1(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_2(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_3(size_t *compare_length, uchar **a, uchar **b);
#endif /* TARGET_OS_SOLARIS */
#endif /* __sun */
/* Get a pointer to a optimal byte-compare function for a given size */
#ifdef __sun
qsort2_cmp get_ptr_compare (size_t size __attribute__((unused)))
{
return (qsort2_cmp) native_compare;
}
#else
qsort2_cmp get_ptr_compare (size_t size)
{
#ifdef TARGET_OS_SOLARIS
return (qsort2_cmp) native_compare;
#else
if (size < 4)
return (qsort2_cmp) ptr_compare;
switch (size & 3) {
@ -64,8 +67,8 @@ qsort2_cmp get_ptr_compare (size_t size)
case 3: return (qsort2_cmp) ptr_compare_3;
}
return 0; /* Impossible */
#endif /* TARGET_OS_SOLARIS */
}
#endif /* __sun */
/*
@ -75,6 +78,8 @@ qsort2_cmp get_ptr_compare (size_t size)
#define cmp(N) if (first[N] != last[N]) return (int) first[N] - (int) last[N]
#ifndef __sun
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
{
reg3 int length= *compare_length;
@ -177,6 +182,8 @@ static int ptr_compare_3(size_t *compare_length,uchar **a, uchar **b)
return (0);
}
#endif /* !__sun */
void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos)
{
switch (pack_length) {

1
sql/my_decimal.cc
View File

@ -13,6 +13,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include "sql_priv.h"
#include <time.h>

4
sql/mysqld.cc
View File

@ -3247,8 +3247,8 @@ static int init_common_variables()
size_t *pagesize = (size_t *) malloc(sizeof(size_t) * nelem);
if (pagesize != NULL && getpagesizes(pagesize, nelem) > 0)
{
size_t i, max_page_size= 0;
for (i= 0; i < nelem; i++)
size_t max_page_size= 0;
for (int i= 0; i < nelem; i++)
{
if (pagesize[i] > max_page_size &&
pagesize[i] <= max_desired_page_size)

2
sql/sql_audit.h
View File

@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include <mysql/plugin_audit.h>
#include "sql_class.h"

2
sql/sql_plugin.h
View File

@ -16,6 +16,8 @@
#ifndef _sql_plugin_h
#define _sql_plugin_h
#include <my_global.h>
/*
the following #define adds server-only members to enum_mysql_show_type,
that is defined in plugin.h

2
sql/sql_show.cc
View File

@ -2255,7 +2255,7 @@ static bool show_status_array(THD *thd, const char *wild,
end= int10_to_str(*(long*) value, buff, 10);
break;
case SHOW_LONGLONG_STATUS:
value= ((char *) status_var + (ulonglong) value);
value= ((char *) status_var + (ulong) value);
/* fall through */
case SHOW_LONGLONG:
end= longlong10_to_str(*(longlong*) value, buff, 10);

8
sql/sys_vars.h
View File

@ -1191,7 +1191,8 @@ public:
void global_save_default(THD *thd, set_var *var)
{
LEX_STRING pname;
pname.str= *(char**)option.def_value;
char **default_value= reinterpret_cast<char**>(option.def_value);
pname.str= *default_value;
pname.length= strlen(pname.str);
plugin_ref plugin;
@ -1556,7 +1557,10 @@ public:
void session_save_default(THD *thd, set_var *var)
{ var->save_result.ptr= global_var(void*); }
void global_save_default(THD *thd, set_var *var)
{ var->save_result.ptr= *(void**)option.def_value; }
{
void **default_value= reinterpret_cast<void**>(option.def_value);
var->save_result.ptr= *default_value;
}
bool check_update_type(Item_result type)
{ return type != INT_RESULT && type != STRING_RESULT; }
uchar *session_value_ptr(THD *thd, LEX_STRING *base)

2
storage/perfschema/pfs_instr.cc
View File

@ -18,9 +18,9 @@
Performance schema instruments (implementation).
*/
#include <my_global.h>
#include <string.h>
#include "my_global.h"
#include "my_sys.h"
#include "pfs.h"
#include "pfs_stat.h"