From: Tor Didriksen Date: December 15 2010 8:32am Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3195) Bug#58699 List-Archive: http://lists.mysql.com/commits/126888 X-Bug: 58699 Message-Id: <20101215083213.3102233E6@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4644151071575673978==" --===============4644151071575673978== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/5.5-bugteam-bug58137/ based on revid:gleb.shchepa@stripped 3195 Tor Didriksen 2010-12-13 Bug #58699 cannot build with gcc dbg on solaris @ include/my_pthread.h On solaris pthread_once_t contains an array, so we must wrap the initialization in {} @ 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. @ 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. modified: include/my_pthread.h include/mysql/psi/mysql_file.h mysys/ptr_cmp.c sql/my_decimal.cc sql/mysqld.cc sql/sql_audit.h sql/sql_plugin.h sql/sql_show.cc sql/sys_vars.h storage/perfschema/pfs_instr.cc === modified file 'include/my_pthread.h' --- a/include/my_pthread.h 2010-10-20 14:48:19 +0000 +++ b/include/my_pthread.h 2010-12-13 16:04:03 +0000 @@ -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 __GNUC__ && defined TARGET_OS_SOLARIS +#define MY_PTHREAD_ONCE_INIT { PTHREAD_ONCE_INIT } +#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 */ === modified file 'include/mysql/psi/mysql_file.h' --- a/include/mysql/psi/mysql_file.h 2010-07-09 23:00:24 +0000 +++ b/include/mysql/psi/mysql_file.h 2010-12-13 16:04:03 +0000 @@ -16,6 +16,8 @@ #ifndef MYSQL_FILE_H #define MYSQL_FILE_H +#include "my_global.h" + /* For strlen() */ #include /* For MY_STAT */ === modified file 'mysys/ptr_cmp.c' --- a/mysys/ptr_cmp.c 2009-11-20 19:01:43 +0000 +++ b/mysys/ptr_cmp.c 2010-12-13 16:04:03 +0000 @@ -50,11 +50,15 @@ static int ptr_compare_3(size_t *compare /* Get a pointer to a optimal byte-compare function for a given size */ +#ifdef TARGET_OS_SOLARIS qsort2_cmp get_ptr_compare (size_t size) { -#ifdef TARGET_OS_SOLARIS + (void) size; return (qsort2_cmp) native_compare; +} #else +qsort2_cmp get_ptr_compare (size_t size) +{ if (size < 4) return (qsort2_cmp) ptr_compare; switch (size & 3) { @@ -64,8 +68,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 /* TARGET_OS_SOLARIS */ /* @@ -75,6 +79,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 TARGET_OS_SOLARIS + static int ptr_compare(size_t *compare_length, uchar **a, uchar **b) { reg3 int length= *compare_length; @@ -177,6 +183,8 @@ static int ptr_compare_3(size_t *compare return (0); } +#endif /* !TARGET_OS_SOLARIS */ + void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos) { switch (pack_length) { === modified file 'sql/my_decimal.cc' --- a/sql/my_decimal.cc 2010-12-14 16:26:18 +0000 +++ b/sql/my_decimal.cc 2010-12-13 16:04:03 +0000 @@ -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 === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2010-12-14 14:34:23 +0000 +++ b/sql/mysqld.cc 2010-12-13 16:04:03 +0000 @@ -3258,8 +3258,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) === modified file 'sql/sql_audit.h' --- a/sql/sql_audit.h 2010-12-14 14:34:23 +0000 +++ b/sql/sql_audit.h 2010-12-13 16:04:03 +0000 @@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "my_global.h" + #include #include "sql_class.h" === modified file 'sql/sql_plugin.h' --- a/sql/sql_plugin.h 2010-12-01 22:15:14 +0000 +++ b/sql/sql_plugin.h 2010-12-13 16:04:03 +0000 @@ -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 === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2010-12-14 10:46:00 +0000 +++ b/sql/sql_show.cc 2010-12-13 16:04:03 +0000 @@ -2246,7 +2246,7 @@ static bool show_status_array(THD *thd, 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); === modified file 'sql/sys_vars.h' --- a/sql/sys_vars.h 2010-10-08 00:53:00 +0000 +++ b/sql/sys_vars.h 2010-12-13 16:04:03 +0000 @@ -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(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(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) === modified file 'storage/perfschema/pfs_instr.cc' --- a/storage/perfschema/pfs_instr.cc 2010-11-11 11:34:46 +0000 +++ b/storage/perfschema/pfs_instr.cc 2010-12-13 16:04:03 +0000 @@ -18,9 +18,9 @@ Performance schema instruments (implementation). */ +#include "my_global.h" #include -#include "my_global.h" #include "my_sys.h" #include "pfs.h" #include "pfs_stat.h" --===============4644151071575673978== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # 5flsijd13jmuog04 # target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58137/ # testament_sha1: c5ab59ab72400fede81fa13f7799b6f393f539aa # timestamp: 2010-12-15 09:32:12 +0100 # base_revision_id: gleb.shchepa@stripped\ # j5c7u19uhiq6u310 # # Begin bundle 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 B67AYbb/xdyRThQkKMNf/0A= --===============4644151071575673978==--