1 Developed in-house, not fed back.

     2 Solaris-specific

     3 stlport is no longer supported/maintained, so we had to switch to std=c++03

     4 For Sun Studio we must build with -std=c++03 flag

     5 Since Sun Studio depends on seeing __attribute__ ((__weakref__)) in order to generate correct code.

     6 Introduced MY_ATTRIBUTE:  sed -i -e 's/__attribute__/MY_ATTRIBUTE/g' `cat <all srouce files>`

     7 

     8 --- a/client/mysql.cc

     9 +++ b/client/mysql.cc

    10 @@ -1819,7 +1819,7 @@ static void usage(int version)

    11  

    12  

    13  my_bool

    14 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

    15 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

    16  	       char *argument)

    17  {

    18    switch(optid) {

    19 @@ -2755,8 +2755,8 @@ static void initialize_readline (char *name)

    20  */

    21  

    22  static char **new_mysql_completion(const char *text,

    23 -                                   int start __attribute__((unused)),

    24 -                                   int end __attribute__((unused)))

    25 +                                   int start MY_ATTRIBUTE((unused)),

    26 +                                   int end MY_ATTRIBUTE((unused)))

    27  {

    28    if (!status.batch && !quick)

    29  #if defined(USE_NEW_READLINE_INTERFACE)

    30 @@ -3166,8 +3166,8 @@ static void print_help_item(MYSQL_ROW *cur, int num_name, int num_cat, char *las

    31  }

    32  

    33  

    34 -static int com_server_help(String *buffer __attribute__((unused)),

    35 -			   char *line __attribute__((unused)), char *help_arg)

    36 +static int com_server_help(String *buffer MY_ATTRIBUTE((unused)),

    37 +			   char *line MY_ATTRIBUTE((unused)), char *help_arg)

    38  {

    39    MYSQL_ROW cur;

    40    const char *server_cmd;

    41 @@ -3273,8 +3273,8 @@ err:

    42  }

    43  

    44  static int

    45 -com_help(String *buffer __attribute__((unused)),

    46 -	 char *line __attribute__((unused)))

    47 +com_help(String *buffer MY_ATTRIBUTE((unused)),

    48 +	 char *line MY_ATTRIBUTE((unused)))

    49  {

    50    reg1 int i, j;

    51    char * help_arg= strchr(line,' '), buff[32], *end;

    52 @@ -3313,7 +3313,7 @@ com_help(String *buffer __attribute__((unused)),

    53  

    54  	/* ARGSUSED */

    55  static int

    56 -com_clear(String *buffer,char *line __attribute__((unused)))

    57 +com_clear(String *buffer,char *line MY_ATTRIBUTE((unused)))

    58  {

    59  #ifdef HAVE_READLINE

    60    if (status.add_to_history)

    61 @@ -3325,7 +3325,7 @@ com_clear(String *buffer,char *line __attribute__((unused)))

    62  

    63  	/* ARGSUSED */

    64  static int

    65 -com_charset(String *buffer __attribute__((unused)), char *line)

    66 +com_charset(String *buffer MY_ATTRIBUTE((unused)), char *line)

    67  {

    68    char buff[256], *param;

    69    const CHARSET_INFO *new_cs;

    70 @@ -3357,7 +3357,7 @@ com_charset(String *buffer __attribute__((unused)), char *line)

    71  

    72  

    73  static int

    74 -com_go(String *buffer,char *line __attribute__((unused)))

    75 +com_go(String *buffer,char *line MY_ATTRIBUTE((unused)))

    76  {

    77    char		buff[200]; /* about 110 chars used so far */

    78    char		time_buff[52+3+1]; /* time max + space&parens + NUL */

    79 @@ -4118,8 +4118,8 @@ print_tab_data(MYSQL_RES *result)

    80  }

    81  

    82  static int

    83 -com_tee(String *buffer __attribute__((unused)),

    84 -        char *line __attribute__((unused)))

    85 +com_tee(String *buffer MY_ATTRIBUTE((unused)),

    86 +        char *line MY_ATTRIBUTE((unused)))

    87  {

    88    char file_name[FN_REFLEN], *end, *param;

    89  

    90 @@ -4161,8 +4161,8 @@ com_tee(String *buffer __attribute__((unused)),

    91  

    92  

    93  static int

    94 -com_notee(String *buffer __attribute__((unused)),

    95 -	  char *line __attribute__((unused)))

    96 +com_notee(String *buffer MY_ATTRIBUTE((unused)),

    97 +	  char *line MY_ATTRIBUTE((unused)))

    98  {

    99    if (opt_outfile)

   100      end_tee();

   101 @@ -4176,8 +4176,8 @@ com_notee(String *buffer __attribute__((unused)),

   102  

   103  #ifdef USE_POPEN

   104  static int

   105 -com_pager(String *buffer __attribute__((unused)),

   106 -          char *line __attribute__((unused)))

   107 +com_pager(String *buffer MY_ATTRIBUTE((unused)),

   108 +          char *line MY_ATTRIBUTE((unused)))

   109  {

   110    char pager_name[FN_REFLEN], *end, *param;

   111  

   112 @@ -4220,8 +4220,8 @@ com_pager(String *buffer __attribute__((unused)),

   113  

   114  

   115  static int

   116 -com_nopager(String *buffer __attribute__((unused)),

   117 -	    char *line __attribute__((unused)))

   118 +com_nopager(String *buffer MY_ATTRIBUTE((unused)),

   119 +	    char *line MY_ATTRIBUTE((unused)))

   120  {

   121    strmov(pager, "stdout");

   122    opt_nopager=1;

   123 @@ -4238,7 +4238,7 @@ com_nopager(String *buffer __attribute__((unused)),

   124  

   125  #ifdef USE_POPEN

   126  static int

   127 -com_edit(String *buffer,char *line __attribute__((unused)))

   128 +com_edit(String *buffer,char *line MY_ATTRIBUTE((unused)))

   129  {

   130    char	filename[FN_REFLEN],buff[160];

   131    int	fd,tmp;

   132 @@ -4282,16 +4282,16 @@ err:

   133  /* If arg is given, exit without errors. This happens on command 'quit' */

   134  

   135  static int

   136 -com_quit(String *buffer __attribute__((unused)),

   137 -	 char *line __attribute__((unused)))

   138 +com_quit(String *buffer MY_ATTRIBUTE((unused)),

   139 +	 char *line MY_ATTRIBUTE((unused)))

   140  {

   141    status.exit_status=0;

   142    return 1;

   143  }

   144  

   145  static int

   146 -com_rehash(String *buffer __attribute__((unused)),

   147 -	 char *line __attribute__((unused)))

   148 +com_rehash(String *buffer MY_ATTRIBUTE((unused)),

   149 +	 char *line MY_ATTRIBUTE((unused)))

   150  {

   151  #ifdef HAVE_READLINE

   152    build_completion_hash(1, 0);

   153 @@ -4302,8 +4302,8 @@ com_rehash(String *buffer __attribute__((unused)),

   154  

   155  #ifdef USE_POPEN

   156  static int

   157 -com_shell(String *buffer __attribute__((unused)),

   158 -          char *line __attribute__((unused)))

   159 +com_shell(String *buffer MY_ATTRIBUTE((unused)),

   160 +          char *line MY_ATTRIBUTE((unused)))

   161  {

   162    char *shell_cmd;

   163  

   164 @@ -4330,7 +4330,7 @@ com_shell(String *buffer __attribute__((unused)),

   165  

   166  

   167  static int

   168 -com_print(String *buffer,char *line __attribute__((unused)))

   169 +com_print(String *buffer,char *line MY_ATTRIBUTE((unused)))

   170  {

   171    tee_puts("--------------", stdout);

   172    (void) tee_fputs(buffer->c_ptr(), stdout);

   173 @@ -4395,7 +4395,7 @@ com_connect(String *buffer, char *line)

   174  }

   175  

   176  

   177 -static int com_source(String *buffer __attribute__((unused)),

   178 +static int com_source(String *buffer MY_ATTRIBUTE((unused)),

   179                        char *line)

   180  {

   181    char source_name[FN_REFLEN], *end, *param;

   182 @@ -4450,7 +4450,7 @@ static int com_source(String *buffer __attribute__((unused)),

   183  

   184  	/* ARGSUSED */

   185  static int

   186 -com_delimiter(String *buffer __attribute__((unused)), char *line)

   187 +com_delimiter(String *buffer MY_ATTRIBUTE((unused)), char *line)

   188  {

   189    char buff[256], *tmp;

   190  

   191 @@ -4479,7 +4479,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)

   192  

   193  	/* ARGSUSED */

   194  static int

   195 -com_use(String *buffer __attribute__((unused)), char *line)

   196 +com_use(String *buffer MY_ATTRIBUTE((unused)), char *line)

   197  {

   198    char *tmp, buff[FN_REFLEN + 1];

   199    int select_db;

   200 @@ -4624,8 +4624,8 @@ normalize_dbname(const char *line, char *buff, uint buff_size)

   201  }

   202  

   203  static int

   204 -com_warnings(String *buffer __attribute__((unused)),

   205 -   char *line __attribute__((unused)))

   206 +com_warnings(String *buffer MY_ATTRIBUTE((unused)),

   207 +   char *line MY_ATTRIBUTE((unused)))

   208  {

   209    show_warnings = 1;

   210    put_info("Show warnings enabled.",INFO_INFO);

   211 @@ -4633,8 +4633,8 @@ com_warnings(String *buffer __attribute__((unused)),

   212  }

   213  

   214  static int

   215 -com_nowarnings(String *buffer __attribute__((unused)),

   216 -   char *line __attribute__((unused)))

   217 +com_nowarnings(String *buffer MY_ATTRIBUTE((unused)),

   218 +   char *line MY_ATTRIBUTE((unused)))

   219  {

   220    show_warnings = 0;

   221    put_info("Show warnings disabled.",INFO_INFO);

   222 @@ -4914,8 +4914,8 @@ sql_connect(char *host,char *database,char *user,char *password,uint silent)

   223  

   224  

   225  static int

   226 -com_status(String *buffer __attribute__((unused)),

   227 -	   char *line __attribute__((unused)))

   228 +com_status(String *buffer MY_ATTRIBUTE((unused)),

   229 +	   char *line MY_ATTRIBUTE((unused)))

   230  {

   231    const char *status_str;

   232    char buff[40];

   233 @@ -5555,7 +5555,7 @@ static void init_username()

   234    }

   235  }

   236  

   237 -static int com_prompt(String *buffer __attribute__((unused)),

   238 +static int com_prompt(String *buffer MY_ATTRIBUTE((unused)),

   239                        char *line)

   240  {

   241    char *ptr=strchr(line, ' ');

   242 --- a/client/mysql_config_editor.cc

   243 +++ b/client/mysql_config_editor.cc

   244 @@ -1,5 +1,5 @@

   245  /*

   246 -   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.

   247 +   Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.

   248  

   249     This program is free software; you can redistribute it and/or modify

   250     it under the terms of the GNU General Public License as published by

   251 @@ -209,7 +209,7 @@ static struct my_option my_help_command_options[]=

   252  

   253  my_bool

   254  my_program_get_one_option(int optid,

   255 -                          const struct my_option *opt __attribute__((unused)),

   256 +                          const struct my_option *opt MY_ATTRIBUTE((unused)),

   257                            char *argument)

   258  {

   259    switch(optid) {

   260 @@ -230,7 +230,7 @@ my_program_get_one_option(int optid,

   261  

   262  my_bool

   263  my_set_command_get_one_option(int optid,

   264 -                              const struct my_option *opt __attribute__((unused)),

   265 +                              const struct my_option *opt MY_ATTRIBUTE((unused)),

   266                                char *argument)

   267  {

   268    switch(optid) {

   269 @@ -257,7 +257,7 @@ my_set_command_get_one_option(int optid,

   270  

   271  my_bool

   272  my_remove_command_get_one_option(int optid,

   273 -                                 const struct my_option *opt __attribute__((unused)),

   274 +                                 const struct my_option *opt MY_ATTRIBUTE((unused)),

   275                                   char *argument)

   276  {

   277    switch(optid) {

   278 @@ -281,7 +281,7 @@ my_remove_command_get_one_option(int optid,

   279  

   280  my_bool

   281  my_print_command_get_one_option(int optid,

   282 -                                const struct my_option *opt __attribute__((unused)),

   283 +                                const struct my_option *opt MY_ATTRIBUTE((unused)),

   284                                  char *argument)

   285  {

   286    switch(optid) {

   287 @@ -305,7 +305,7 @@ my_print_command_get_one_option(int optid,

   288  

   289  my_bool

   290  my_reset_command_get_one_option(int optid,

   291 -                                const struct my_option *opt __attribute__((unused)),

   292 +                                const struct my_option *opt MY_ATTRIBUTE((unused)),

   293                                  char *argument)

   294  {

   295    switch(optid) {

   296 --- a/client/mysql_plugin.c

   297 +++ b/client/mysql_plugin.c

   298 @@ -1,5 +1,5 @@

   299  /*

   300 -   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.

   301 +   Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.

   302  

   303     This program is free software; you can redistribute it and/or modify

   304     it under the terms of the GNU General Public License as published by

   305 @@ -406,7 +406,7 @@ exit:

   306  static void usage(void)

   307  {

   308    PRINT_VERSION;

   309 -  puts("Copyright (c) 2011, 2015, Oracle and/or its affiliates. "

   310 +  puts("Copyright (c) 2011, 2016, Oracle and/or its affiliates. "

   311         "All rights reserved.\n");

   312    puts("Enable or disable plugins.");

   313    printf("\nUsage: %s [options] <plugin> ENABLE|DISABLE\n\nOptions:\n",

   314 @@ -471,7 +471,7 @@ static void print_default_values(void)

   315  

   316  static my_bool

   317  get_one_option(int optid,

   318 -               const struct my_option *opt __attribute__((unused)),

   319 +               const struct my_option *opt MY_ATTRIBUTE((unused)),

   320                 char *argument)

   321  {

   322    switch(optid) {

   323 --- a/client/mysqladmin.cc

   324 +++ b/client/mysqladmin.cc

   325 @@ -237,7 +237,7 @@ static struct my_option my_long_options[] =

   326  static const char *load_default_groups[]= { "mysqladmin","client",0 };

   327  

   328  my_bool

   329 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   330 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   331  	       char *argument)

   332  {

   333    int error = 0;

   334 @@ -528,7 +528,7 @@ int main(int argc,char *argv[])

   335  }

   336  

   337  

   338 -sig_handler endprog(int signal_number __attribute__((unused)))

   339 +sig_handler endprog(int signal_number MY_ATTRIBUTE((unused)))

   340  {

   341    interrupted=1;

   342  }

   343 @@ -1416,7 +1416,7 @@ static void print_top(MYSQL_RES *result)

   344  

   345  /* 3.rd argument, uint row, is not in use. Don't remove! */

   346  static void print_row(MYSQL_RES *result, MYSQL_ROW cur,

   347 -		      uint row __attribute__((unused)))

   348 +		      uint row MY_ATTRIBUTE((unused)))

   349  {

   350    uint i,length;

   351    MYSQL_FIELD *field;

   352 @@ -1451,9 +1451,9 @@ static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row)

   353  }

   354  

   355  

   356 -static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)),

   357 +static void print_relative_row_vert(MYSQL_RES *result MY_ATTRIBUTE((unused)),

   358  				    MYSQL_ROW cur,

   359 -				    uint row __attribute__((unused)))

   360 +				    uint row MY_ATTRIBUTE((unused)))

   361  {

   362    uint length;

   363    ulonglong tmp;

   364 --- a/client/mysqlbinlog.cc

   365 +++ b/client/mysqlbinlog.cc

   366 @@ -1,5 +1,5 @@

   367  /*

   368 -   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.

   369 +   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   370  

   371     This program is free software; you can redistribute it and/or modify

   372     it under the terms of the GNU General Public License as published by

   373 @@ -1819,7 +1819,7 @@ static my_time_t convert_str_to_timestamp(const char* str)

   374  

   375  

   376  extern "C" my_bool

   377 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   378 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   379  	       char *argument)

   380  {

   381    bool tty_password=0;

   382 --- a/client/mysqlcheck.c

   383 +++ b/client/mysqlcheck.c

   384 @@ -270,7 +270,7 @@ static void usage(void)

   385  

   386  

   387  static my_bool

   388 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   389 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   390  	       char *argument)

   391  {

   392    int orig_what_to_do= what_to_do;

   393 --- a/client/mysqldump.c

   394 +++ b/client/mysqldump.c

   395 @@ -762,7 +762,7 @@ static void write_footer(FILE *sql_file)

   396  

   397  

   398  uchar* get_table_key(const char *entry, size_t *length,

   399 -                     my_bool not_used __attribute__((unused)))

   400 +                     my_bool not_used MY_ATTRIBUTE((unused)))

   401  {

   402    *length= strlen(entry);

   403    return (uchar*) entry;

   404 @@ -770,7 +770,7 @@ uchar* get_table_key(const char *entry, size_t *length,

   405  

   406  

   407  static my_bool

   408 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   409 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   410                 char *argument)

   411  {

   412    switch (optid) {

   413 @@ -1921,7 +1921,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,

   414                            const char *str_create)

   415  {

   416    uint i;

   417 -  my_bool body_found __attribute__((unused)) = 0;

   418 +  my_bool body_found MY_ATTRIBUTE((unused)) = 0;

   419    char *create_stmt_ptr= NULL;

   420    ulong create_stmt_len= 0;

   421    MYSQL_FIELD *field;

   422 @@ -4281,7 +4281,7 @@ RETURN VALUES

   423    0        Success.

   424    1        Failure.

   425  */

   426 -int init_dumping_views(char *qdatabase __attribute__((unused)))

   427 +int init_dumping_views(char *qdatabase MY_ATTRIBUTE((unused)))

   428  {

   429      return 0;

   430  } /* init_dumping_views */

   431 --- a/client/mysqlimport.c

   432 +++ b/client/mysqlimport.c

   433 @@ -222,7 +222,7 @@ file. The SQL command 'LOAD DATA INFILE' is used to import the rows.\n");

   434  

   435  

   436  static my_bool

   437 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   438 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   439  	       char *argument)

   440  {

   441    switch(optid) {

   442 --- a/client/mysqlshow.c

   443 +++ b/client/mysqlshow.c

   444 @@ -314,7 +314,7 @@ are shown.");

   445  

   446  

   447  static my_bool

   448 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   449 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   450  	       char *argument)

   451  {

   452    switch(optid) {

   453 --- a/client/mysqlslap.c

   454 +++ b/client/mysqlslap.c

   455 @@ -736,7 +736,7 @@ static void usage(void)

   456  

   457  

   458  static my_bool

   459 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   460 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   461                 char *argument)

   462  {

   463    DBUG_ENTER("get_one_option");

   464 --- a/client/mysqltest.cc

   465 +++ b/client/mysqltest.cc

   466 @@ -547,12 +547,12 @@ struct st_replace *glob_replace= 0;

   467  void replace_strings_append(struct st_replace *rep, DYNAMIC_STRING* ds,

   468  const char *from, int len);

   469  

   470 -static void cleanup_and_exit(int exit_code) __attribute__((noreturn));

   471 +static void cleanup_and_exit(int exit_code) MY_ATTRIBUTE((noreturn));

   472  

   473  void die(const char *fmt, ...)

   474 -  ATTRIBUTE_FORMAT(printf, 1, 2) __attribute__((noreturn));

   475 +  ATTRIBUTE_FORMAT(printf, 1, 2) MY_ATTRIBUTE((noreturn));

   476  void abort_not_supported_test(const char *fmt, ...)

   477 -  ATTRIBUTE_FORMAT(printf, 1, 2) __attribute__((noreturn));

   478 +  ATTRIBUTE_FORMAT(printf, 1, 2) MY_ATTRIBUTE((noreturn));

   479  void verbose_msg(const char *fmt, ...)

   480    ATTRIBUTE_FORMAT(printf, 1, 2);

   481  void log_msg(const char *fmt, ...)

   482 @@ -2121,7 +2121,7 @@ static void strip_parentheses(struct st_command *command)

   483  C_MODE_START

   484  

   485  static uchar *get_var_key(const uchar* var, size_t *len,

   486 -                          my_bool __attribute__((unused)) t)

   487 +                          my_bool MY_ATTRIBUTE((unused)) t)

   488  {

   489    register char* key;

   490    key = ((VAR*)var)->name;

   491 @@ -4320,7 +4320,7 @@ int do_echo(struct st_command *command)

   492  }

   493  

   494  

   495 -void do_wait_for_slave_to_stop(struct st_command *c __attribute__((unused)))

   496 +void do_wait_for_slave_to_stop(struct st_command *c MY_ATTRIBUTE((unused)))

   497  {

   498    static int SLAVE_POLL_INTERVAL= 300000;

   499    MYSQL* mysql = &cur_con->mysql;

   500 @@ -8418,7 +8418,7 @@ void update_expected_errors(struct st_command* command)

   501  

   502  */

   503  

   504 -void mark_progress(struct st_command* command __attribute__((unused)),

   505 +void mark_progress(struct st_command* command MY_ATTRIBUTE((unused)),

   506                     int line)

   507  {

   508    static ulonglong progress_start= 0; // < Beware

   509 @@ -9465,7 +9465,7 @@ typedef struct st_replace_found {

   510  

   511  void replace_strings_append(REPLACE *rep, DYNAMIC_STRING* ds,

   512                              const char *str,

   513 -                            int len __attribute__((unused)))

   514 +                            int len MY_ATTRIBUTE((unused)))

   515  {

   516    reg1 REPLACE *rep_pos;

   517    reg2 REPLACE_STRING *rep_str;

   518 --- a/cmake/build_configurations/compiler_options.cmake

   519 +++ b/cmake/build_configurations/compiler_options.cmake

   520 @@ -1,4 +1,4 @@

   521 -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.

   522 +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.

   523  # 

   524  # This program is free software; you can redistribute it and/or modify

   525  # it under the terms of the GNU General Public License as published by

   526 @@ -66,11 +66,9 @@ IF(UNIX)

   527        SET(SUNPRO_CXX_LIBRARY "stlport4" CACHE STRING

   528          "What C++ library to use. The server needs stlport4. It is possible to build the client libraries with -DWITHOUT_SERVER=1 -DSUNPRO_CXX_LIBRARY=Cstd")

   529  

   530 -      MESSAGE(STATUS "SUNPRO_CXX_LIBRARY ${SUNPRO_CXX_LIBRARY}")

   531 -

   532        IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")

   533          SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")

   534 -        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic -library=${SUNPRO_CXX_LIBRARY}")

   535 +        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")

   536          # We have to specify "-xO1" for DEBUG flags here,

   537          # see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978

   538          SET(CMAKE_C_FLAGS_DEBUG              "-xO1 ${COMMON_C_FLAGS}")

   539 @@ -85,7 +83,7 @@ IF(UNIX)

   540        ELSE() 

   541          # Assume !x86 is SPARC

   542          SET(COMMON_C_FLAGS                 "-g -Xa -xstrconst -mt")

   543 -        SET(COMMON_CXX_FLAGS               "-g0 -mt -library=${SUNPRO_CXX_LIBRARY}")

   544 +        SET(COMMON_CXX_FLAGS               "-g0 -mt")

   545          IF(32BIT)

   546            SET(COMMON_C_FLAGS               "${COMMON_C_FLAGS} -xarch=sparc")

   547            SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -xarch=sparc")

   548 

   549 --- a/dbug/tests.c

   550 +++ b/dbug/tests.c

   551 @@ -73,7 +73,7 @@ int main (int argc, char *argv[])

   552              DBUG_EVALUATE_IF("evaluate_if", "ON", "OFF"));

   553      DBUG_EXECUTE_IF("pop",  DBUG_POP(); );

   554      {

   555 -      char s[1000] __attribute__((unused));

   556 +      char s[1000] MY_ATTRIBUTE((unused));

   557        DBUG_EXPLAIN(s, sizeof(s)-1);

   558        DBUG_PRINT("explain", ("dbug explained: %s", s));

   559      }

   560 --- a/extra/comp_err.c

   561 +++ b/extra/comp_err.c

   562 @@ -1,5 +1,5 @@

   563  /*

   564 -   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.

   565 +   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   566  

   567     This program is free software; you can redistribute it and/or modify

   568     it under the terms of the GNU General Public License as published by

   569 @@ -1023,8 +1023,8 @@ static void print_version(void)

   570  

   571  

   572  static my_bool

   573 -get_one_option(int optid, const struct my_option *opt __attribute__ ((unused)),

   574 -	       char *argument __attribute__ ((unused)))

   575 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE ((unused)),

   576 +	       char *argument MY_ATTRIBUTE ((unused)))

   577  {

   578    DBUG_ENTER("get_one_option");

   579    switch (optid) {

   580 --- a/extra/innochecksum.cc

   581 +++ b/extra/innochecksum.cc

   582 @@ -1,5 +1,5 @@

   583  /*

   584 -   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.

   585 +   Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.

   586  

   587     This program is free software; you can redistribute it and/or modify

   588     it under the terms of the GNU General Public License as published by

   589 @@ -235,8 +235,8 @@ extern "C" my_bool

   590  innochecksum_get_one_option(

   591  /*========================*/

   592    int optid,

   593 -  const struct my_option *opt __attribute__((unused)),

   594 -  char *argument __attribute__((unused)))

   595 +  const struct my_option *opt MY_ATTRIBUTE((unused)),

   596 +  char *argument MY_ATTRIBUTE((unused)))

   597  {

   598    switch (optid) {

   599    case 'd':

   600 --- a/extra/my_print_defaults.c

   601 +++ b/extra/my_print_defaults.c

   602 @@ -1,6 +1,6 @@

   603  

   604  /*

   605 -   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.

   606 +   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   607  

   608     This program is free software; you can redistribute it and/or modify

   609     it under the terms of the GNU General Public License as published by

   610 @@ -118,8 +118,8 @@ static void usage(my_bool version)

   611  

   612  

   613  static my_bool

   614 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   615 -	       char *argument __attribute__((unused)))

   616 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   617 +	       char *argument MY_ATTRIBUTE((unused)))

   618  {

   619    switch (optid) {

   620      case 'c':

   621 --- a/extra/mysql_waitpid.c

   622 +++ b/extra/mysql_waitpid.c

   623 @@ -1,4 +1,4 @@

   624 -/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.

   625 +/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.

   626  

   627     This program is free software; you can redistribute it and/or modify

   628     it under the terms of the GNU General Public License as published by

   629 @@ -43,8 +43,8 @@ static struct my_option my_long_options[] =

   630  };

   631  

   632  static my_bool

   633 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   634 -	       char *argument __attribute__((unused)))

   635 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   636 +	       char *argument MY_ATTRIBUTE((unused)))

   637  {

   638    switch(optid) {

   639    case 'V':

   640 --- a/extra/perror.c

   641 +++ b/extra/perror.c

   642 @@ -1,5 +1,5 @@

   643  /*

   644 -   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.

   645 +   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   646  

   647     This program is free software; you can redistribute it and/or modify

   648     it under the terms of the GNU General Public License as published by

   649 @@ -94,8 +94,8 @@ static void usage(void)

   650  

   651  

   652  static my_bool

   653 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   654 -	       char *argument __attribute__((unused)))

   655 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   656 +	       char *argument MY_ATTRIBUTE((unused)))

   657  {

   658    switch (optid) {

   659    case 's':

   660 --- a/extra/resolve_stack_dump.cc

   661 +++ b/extra/resolve_stack_dump.cc

   662 @@ -1,4 +1,4 @@

   663 -/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.

   664 +/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.

   665  

   666     This program is free software; you can redistribute it and/or modify

   667     it under the terms of the GNU General Public License as published by

   668 @@ -51,7 +51,7 @@ static char* dump_fname = 0, *sym_fname = 0;

   669  static std::vector<sym_entry> sym_table;

   670  static FILE* fp_dump, *fp_sym = 0, *fp_out; 

   671  static void die(const char* fmt, ...)

   672 -  __attribute__((noreturn)) __attribute__((format(printf, 1, 2)));

   673 +  MY_ATTRIBUTE((noreturn)) MY_ATTRIBUTE((format(printf, 1, 2)));

   674  

   675  static struct my_option my_long_options[] =

   676  {

   677 @@ -107,8 +107,8 @@ static void die(const char* fmt, ...)

   678  

   679  

   680  static my_bool

   681 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   682 -	       char *argument __attribute__((unused)))

   683 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   684 +	       char *argument MY_ATTRIBUTE((unused)))

   685  {

   686    switch(optid) {

   687    case 'V':

   688 --- a/extra/resolveip.c

   689 +++ b/extra/resolveip.c

   690 @@ -1,4 +1,4 @@

   691 -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.

   692 +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   693  

   694     This program is free software; you can redistribute it and/or modify

   695     it under the terms of the GNU General Public License as published by

   696 @@ -72,8 +72,8 @@ static void usage(void)

   697  

   698  

   699  static my_bool

   700 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

   701 -	       char *argument __attribute__((unused)))

   702 +get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),

   703 +	       char *argument MY_ATTRIBUTE((unused)))

   704  {

   705    switch (optid) {

   706    case 'V': print_version(); exit(0);

   707 --- a/extra/yassl/taocrypt/CMakeLists.txt

   708 +++ b/extra/yassl/taocrypt/CMakeLists.txt

   709 @@ -1,4 +1,4 @@

   710 -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.

   711 +# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.

   712  # 

   713  # This program is free software; you can redistribute it and/or modify

   714  # it under the terms of the GNU General Public License as published by

   715 @@ -13,6 +13,8 @@

   716  # along with this program; if not, write to the Free Software

   717  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA

   718  

   719 +INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)

   720 +

   721  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL

   722                      ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include)

   723  

   724 @@ -29,6 +31,14 @@ SET(TAOCRYPT_SOURCES		src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp

   725  				include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp

   726  				include/rabbit.hpp include/hc128.hpp)

   727  

   728 +# Segfaults with SIGILL at high optimization levels in:

   729 +# ModularArithmetic::SimultaneousExponentiate

   730 +IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")

   731 +  IF(CMAKE_CXX_FLAGS MATCHES "-std=")

   732 +    ADD_COMPILE_FLAGS(src/integer.cpp COMPILE_FLAGS "-xO1")

   733 +  ENDIF()

   734 +ENDIF()

   735 +

   736  IF(HAVE_EXPLICIT_TEMPLATE_INSTANTIATION)

   737    SET(TAOCRYPT_SOURCES ${TAOCRYPT_SOURCES} src/template_instnt.cpp)

   738  ENDIF()

   739 --- a/include/atomic/nolock.h

   740 +++ b/include/atomic/nolock.h

   741 @@ -1,7 +1,7 @@

   742  #ifndef ATOMIC_NOLOCK_INCLUDED

   743  #define ATOMIC_NOLOCK_INCLUDED

   744  

   745 -/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. reserved.

   746 +/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. reserved.

   747     reserved.

   748  

   749     This program is free software; you can redistribute it and/or modify

   750 @@ -44,7 +44,7 @@

   751    Type not used so minimal size (emptry struct has different size between C

   752    and C++, zero-length array is gcc-specific).

   753  */

   754 -typedef char my_atomic_rwlock_t __attribute__ ((unused));

   755 +typedef char my_atomic_rwlock_t MY_ATTRIBUTE ((unused));

   756  #define my_atomic_rwlock_destroy(name)

   757  #define my_atomic_rwlock_init(name)

   758  #define my_atomic_rwlock_rdlock(name)

   759 --- a/include/lf.h

   760 +++ b/include/lf.h

   761 @@ -1,4 +1,4 @@

   762 -/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.

   763 +/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.

   764  

   765     This program is free software; you can redistribute it and/or modify

   766     it under the terms of the GNU General Public License as published by

   767 @@ -138,7 +138,7 @@ typedef struct {

   768  #if defined(__GNUC__) && defined(MY_LF_EXTRA_DEBUG)

   769  #define LF_REQUIRE_PINS(N)                                      \

   770    static const char require_pins[LF_PINBOX_PINS-N]              \

   771 -                             __attribute__ ((unused));          \

   772 +                             MY_ATTRIBUTE ((unused));          \

   773    static const int LF_NUM_PINS_IN_THIS_FILE= N;

   774  #define _lf_pin(PINS, PIN, ADDR)                                \

   775    (                                                             \

   776 --- a/include/m_ctype.h

   777 +++ b/include/m_ctype.h

   778 @@ -1,4 +1,4 @@

   779 -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.

   780 +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   781  

   782     This program is free software; you can redistribute it and/or modify

   783     it under the terms of the GNU General Public License as published by

   784 @@ -658,10 +658,10 @@ int my_wildcmp_mb_bin(const CHARSET_INFO *cs,

   785                        const char *wildstr,const char *wildend,

   786                        int escape, int w_one, int w_many);

   787  

   788 -int my_strcasecmp_mb_bin(const CHARSET_INFO * cs __attribute__((unused)),

   789 +int my_strcasecmp_mb_bin(const CHARSET_INFO * cs MY_ATTRIBUTE((unused)),

   790                           const char *s, const char *t);

   791  

   792 -void my_hash_sort_mb_bin(const CHARSET_INFO *cs __attribute__((unused)),

   793 +void my_hash_sort_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),

   794                           const uchar *key, size_t len,ulong *nr1, ulong *nr2);

   795  

   796  size_t my_strnxfrm_mb(const CHARSET_INFO *,

   797 --- a/include/my_atomic.h

   798 +++ b/include/my_atomic.h

   799 @@ -1,7 +1,7 @@

   800  #ifndef MY_ATOMIC_INCLUDED

   801  #define MY_ATOMIC_INCLUDED

   802  

   803 -/* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.

   804 +/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.

   805  

   806     This program is free software; you can redistribute it and/or modify

   807     it under the terms of the GNU General Public License as published by

   808 @@ -121,11 +121,11 @@

   809          typedef union {                                         \

   810            int  ## S  i;                                         \

   811            uint ## S  u;                                         \

   812 -        } U_ ## S   __attribute__ ((transparent_union));        \

   813 +        } U_ ## S   MY_ATTRIBUTE ((transparent_union));        \

   814          typedef union {                                         \

   815            int  ## S volatile *i;                                \

   816            uint ## S volatile *u;                                \

   817 -        } Uv_ ## S   __attribute__ ((transparent_union));

   818 +        } Uv_ ## S   MY_ATTRIBUTE ((transparent_union));

   819  #define uintptr intptr

   820  make_transparent_unions(8)

   821  make_transparent_unions(16)

   822 --- a/include/my_attribute.h

   823 +++ b/include/my_attribute.h

   824 @@ -1,4 +1,4 @@

   825 -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.

   826 +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

   827  

   828     This program is free software; you can redistribute it and/or modify

   829     it under the terms of the GNU General Public License as published by

   830 @@ -28,41 +28,30 @@

   831  #endif

   832  

   833  /*

   834 -  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.

   835 +  Disable MY_ATTRIBUTE() on g++ < 3.4, and non-gcc compilers.

   836    Some forms of __attribute__ are actually supported in earlier versions of

   837    g++, but we just disable them all because we only use them to generate

   838    compilation warnings.

   839  */

   840 -#ifndef __attribute__

   841 -# if !defined(__GNUC__)

   842 -#  define __attribute__(A)

   843 -# elif GCC_VERSION < 2008

   844 -#  define __attribute__(A)

   845 -# elif defined(__cplusplus) && GCC_VERSION < 3004

   846 -#  define __attribute__(A)

   847 -# endif

   848 +#ifndef MY_ATTRIBUTE

   849 +#if defined(__GNUC__) && GCC_VERSION > 3003

   850 +#  define MY_ATTRIBUTE(A) __attribute__(A)

   851 +#else

   852 +#  define MY_ATTRIBUTE(A)

   853 +#endif

   854  #endif

   855  

   856  /*

   857 -  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4

   858 -  But that's already covered by the __attribute__ tests above, so this is

   859 +  __attribute__((format(...))) is only supported in g++ >= 3.4

   860 +  But that's already covered by the MY_ATTRIBUTE tests above, so this is

   861    just a convenience macro.

   862  */

   863  #ifndef ATTRIBUTE_FORMAT

   864 -# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))

   865 +#  define ATTRIBUTE_FORMAT(style, m, n) MY_ATTRIBUTE((format(style, m, n)))

   866  #endif

   867  

   868 -/*

   869 -

   870 -   __attribute__((format(...))) on a function pointer is not supported

   871 -   until  gcc 3.1

   872 -*/

   873  #ifndef ATTRIBUTE_FORMAT_FPTR

   874 -# if (GCC_VERSION >= 3001)

   875  #  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)

   876 -# else

   877 -#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)

   878 -# endif /* GNUC >= 3.1 */

   879  #endif

   880  

   881  

   882 --- a/include/my_global.h

   883 +++ b/include/my_global.h

   884 @@ -1,5 +1,5 @@

   885  /*

   886 -   Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.

   887 +   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.

   888  

   889     This program is free software; you can redistribute it and/or modify

   890     it under the terms of the GNU General Public License as published by

   891 @@ -184,7 +184,7 @@

   892    other reason to use them is for documentation

   893  */

   894  

   895 -#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)

   896 +#if !defined(__builtin_expect)

   897  #define __builtin_expect(x, expected_value) (x)

   898  #endif

   899  

   900 @@ -374,7 +374,7 @@ C_MODE_END

   901  #define compile_time_assert(X)                                  \

   902    do                                                            \

   903    {                                                             \

   904 -    typedef char compile_time_assert[(X) ? 1 : -1] __attribute__((unused)); \

   905 +    typedef char compile_time_assert[(X) ? 1 : -1] MY_ATTRIBUTE((unused)); \

   906    } while(0)

   907  #endif

   908  

   909 --- a/include/my_pthread.h

   910 +++ b/include/my_pthread.h

   911 @@ -860,7 +860,7 @@ struct st_my_thread_var

   912  #endif

   913  };

   914  

   915 -extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));

   916 +extern struct st_my_thread_var *_my_thread_var(void) MY_ATTRIBUTE ((const));

   917  extern int set_mysys_var(struct st_my_thread_var *mysys_var);

   918  extern void **my_thread_var_dbug();

   919  extern uint my_thread_end_wait_time;

   920 --- a/include/mysql/psi/mysql_file.h

   921 +++ b/include/mysql/psi/mysql_file.h

   922 @@ -1,4 +1,4 @@

   923 -/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.

   924 +/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.

   925  

   926    This program is free software; you can redistribute it and/or modify

   927    it under the terms of the GNU General Public License as published by

   928 @@ -511,9 +511,9 @@ static inline void inline_mysql_file_register(

   929    PSI_file_info *info,

   930    int count

   931  #else

   932 -  const char *category __attribute__ ((unused)),

   933 -  void *info __attribute__ ((unused)),

   934 -  int count __attribute__ ((unused))

   935 +  const char *category MY_ATTRIBUTE ((unused)),

   936 +  void *info MY_ATTRIBUTE ((unused)),

   937 +  int count MY_ATTRIBUTE ((unused))

   938  #endif

   939  )

   940  {

   941 --- a/include/mysql/psi/mysql_socket.h

   942 +++ b/include/mysql/psi/mysql_socket.h

   943 @@ -1,4 +1,4 @@

   944 -/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.

   945 +/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.

   946  

   947  This program is free software; you can redistribute it and/or

   948  modify it under the terms of the GNU General Public License as

   949 @@ -114,9 +114,9 @@ mysql_socket_set_address(

   950    const struct sockaddr *addr,

   951    socklen_t addr_len

   952  #else

   953 -  MYSQL_SOCKET socket __attribute__ ((unused)),

   954 -  const struct sockaddr *addr __attribute__ ((unused)),

   955 -  socklen_t addr_len __attribute__ ((unused))

   956 +  MYSQL_SOCKET socket MY_ATTRIBUTE ((unused)),

   957 +  const struct sockaddr *addr MY_ATTRIBUTE ((unused)),

   958 +  socklen_t addr_len MY_ATTRIBUTE ((unused))

   959  #endif

   960  )

   961  {

   962 @@ -136,7 +136,7 @@ mysql_socket_set_thread_owner(

   963  #ifdef HAVE_PSI_SOCKET_INTERFACE

   964  MYSQL_SOCKET socket

   965  #else

   966 -MYSQL_SOCKET socket __attribute__ ((unused))

   967 +MYSQL_SOCKET socket MY_ATTRIBUTE ((unused))

   968  #endif

   969  )

   970  {

   971 --- a/include/mysql/psi/mysql_thread.h

   972 +++ b/include/mysql/psi/mysql_thread.h

   973 @@ -1,4 +1,4 @@

   974 -/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.

   975 +/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.

   976  

   977    This program is free software; you can redistribute it and/or modify

   978    it under the terms of the GNU General Public License as published by

   979 @@ -587,9 +587,9 @@ static inline void inline_mysql_mutex_register(

   980    PSI_mutex_info *info,

   981    int count

   982  #else

   983 -  const char *category __attribute__ ((unused)),

   984 -  void *info __attribute__ ((unused)),

   985 -  int count __attribute__ ((unused))

   986 +  const char *category MY_ATTRIBUTE ((unused)),

   987 +  void *info MY_ATTRIBUTE ((unused)),

   988 +  int count MY_ATTRIBUTE ((unused))

   989  #endif

   990  )

   991  {

   992 @@ -771,9 +771,9 @@ static inline void inline_mysql_rwlock_register(

   993    PSI_rwlock_info *info,

   994    int count

   995  #else

   996 -  const char *category __attribute__ ((unused)),

   997 -  void *info __attribute__ ((unused)),

   998 -  int count __attribute__ ((unused))

   999 +  const char *category MY_ATTRIBUTE ((unused)),

  1000 +  void *info MY_ATTRIBUTE ((unused)),

  1001 +  int count MY_ATTRIBUTE ((unused))

  1002  #endif

  1003  )

  1004  {

  1005 @@ -1089,9 +1089,9 @@ static inline void inline_mysql_cond_register(

  1006    PSI_cond_info *info,

  1007    int count

  1008  #else

  1009 -  const char *category __attribute__ ((unused)),

  1010 -  void *info __attribute__ ((unused)),

  1011 -  int count __attribute__ ((unused))

  1012 +  const char *category MY_ATTRIBUTE ((unused)),

  1013 +  void *info MY_ATTRIBUTE ((unused)),

  1014 +  int count MY_ATTRIBUTE ((unused))

  1015  #endif

  1016  )

  1017  {

  1018 @@ -1231,9 +1231,9 @@ static inline void inline_mysql_thread_register(

  1019    PSI_thread_info *info,

  1020    int count

  1021  #else

  1022 -  const char *category __attribute__ ((unused)),

  1023 -  void *info __attribute__ ((unused)),

  1024 -  int count __attribute__ ((unused))

  1025 +  const char *category MY_ATTRIBUTE ((unused)),

  1026 +  void *info MY_ATTRIBUTE ((unused)),

  1027 +  int count MY_ATTRIBUTE ((unused))

  1028  #endif

  1029  )

  1030  {

  1031 --- a/libmysql/libmysql.c

  1032 +++ b/libmysql/libmysql.c

  1033 @@ -1,4 +1,4 @@

  1034 -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.

  1035 +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.

  1036  

  1037     This program is free software; you can redistribute it and/or modify

  1038     it under the terms of the GNU General Public License as published by

  1039 @@ -111,9 +111,9 @@ typedef struct st_mysql_stmt_extension

  1040      1  could not initialize environment (out of memory or thread keys)

  1041  */

  1042  

  1043 -int STDCALL mysql_server_init(int argc __attribute__((unused)),

  1044 -			      char **argv __attribute__((unused)),

  1045 -			      char **groups __attribute__((unused)))

  1046 +int STDCALL mysql_server_init(int argc MY_ATTRIBUTE((unused)),

  1047 +			      char **argv MY_ATTRIBUTE((unused)),

  1048 +			      char **groups MY_ATTRIBUTE((unused)))

  1049  {

  1050    int result= 0;

  1051    if (!mysql_client_init)

  1052 @@ -128,7 +128,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),

  1053      if (!mysql_port)

  1054      {

  1055        char *env;

  1056 -      struct servent *serv_ptr __attribute__((unused));

  1057 +      struct servent *serv_ptr MY_ATTRIBUTE((unused));

  1058  

  1059        mysql_port = MYSQL_PORT;

  1060  

  1061 @@ -264,7 +264,7 @@ append_wild(char *to, char *end, const char *wild)

  1062  **************************************************************************/

  1063  

  1064  void STDCALL

  1065 -mysql_debug(const char *debug __attribute__((unused)))

  1066 +mysql_debug(const char *debug MY_ATTRIBUTE((unused)))

  1067  {

  1068  #ifndef DBUG_OFF

  1069    char	*env;

  1070 @@ -299,7 +299,7 @@ mysql_debug(const char *debug __attribute__((unused)))

  1071  **************************************************************************/

  1072  

  1073  sig_handler

  1074 -my_pipe_sig_handler(int sig __attribute__((unused)))

  1075 +my_pipe_sig_handler(int sig MY_ATTRIBUTE((unused)))

  1076  {

  1077    DBUG_PRINT("info",("Hit by signal %d",sig));

  1078  #ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY

  1079 @@ -559,7 +559,7 @@ typedef struct st_default_local_infile

  1080  */

  1081  

  1082  static int default_local_infile_init(void **ptr, const char *filename,

  1083 -             void *userdata __attribute__ ((unused)))

  1084 +             void *userdata MY_ATTRIBUTE ((unused)))

  1085  {

  1086    default_local_infile_data *data;

  1087    char tmp_name[FN_REFLEN];

  1088 @@ -2341,15 +2341,15 @@ stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row)

  1089  */

  1090  

  1091  static int

  1092 -stmt_read_row_no_data(MYSQL_STMT *stmt  __attribute__((unused)),

  1093 -                      unsigned char **row  __attribute__((unused)))

  1094 +stmt_read_row_no_data(MYSQL_STMT *stmt  MY_ATTRIBUTE((unused)),

  1095 +                      unsigned char **row  MY_ATTRIBUTE((unused)))

  1096  {

  1097    return MYSQL_NO_DATA;

  1098  }

  1099  

  1100  static int

  1101 -stmt_read_row_no_result_set(MYSQL_STMT *stmt  __attribute__((unused)),

  1102 -                      unsigned char **row  __attribute__((unused)))

  1103 +stmt_read_row_no_result_set(MYSQL_STMT *stmt  MY_ATTRIBUTE((unused)),

  1104 +                      unsigned char **row  MY_ATTRIBUTE((unused)))

  1105  {

  1106    set_stmt_error(stmt, CR_NO_RESULT_SET, unknown_sqlstate, NULL);

  1107    return 1;

  1108 @@ -3708,7 +3708,7 @@ static void fetch_result_short(MYSQL_BIND *param, MYSQL_FIELD *field,

  1109  }

  1110  

  1111  static void fetch_result_int32(MYSQL_BIND *param,

  1112 -                               MYSQL_FIELD *field __attribute__((unused)),

  1113 +                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),

  1114                                 uchar **row)

  1115  {

  1116    my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);

  1117 @@ -3719,7 +3719,7 @@ static void fetch_result_int32(MYSQL_BIND *param,

  1118  }

  1119  

  1120  static void fetch_result_int64(MYSQL_BIND *param,

  1121 -                               MYSQL_FIELD *field __attribute__((unused)),

  1122 +                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),

  1123                                 uchar **row)

  1124  {

  1125    my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);

  1126 @@ -3730,7 +3730,7 @@ static void fetch_result_int64(MYSQL_BIND *param,

  1127  }

  1128  

  1129  static void fetch_result_float(MYSQL_BIND *param,

  1130 -                               MYSQL_FIELD *field __attribute__((unused)),

  1131 +                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),

  1132                                 uchar **row)

  1133  {

  1134    float value;