Developed in-house, not fed back.

Solaris-specific

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

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

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

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

--- a/client/mysql.cc

+++ b/client/mysql.cc

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

 my_bool

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

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

 	       char *argument)

 {

   switch(optid) {

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

 */

 static char **new_mysql_completion(const char *text,

-                                   int start __attribute__((unused)),

-                                   int end __attribute__((unused)))

+                                   int start MY_ATTRIBUTE((unused)),

+                                   int end MY_ATTRIBUTE((unused)))

 {

   if (!status.batch && !quick)

 #if defined(USE_NEW_READLINE_INTERFACE)

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

 }

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

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

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

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

 {

   MYSQL_ROW cur;

   const char *server_cmd;

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

 }

 static int

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

-	 char *line __attribute__((unused)))

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

+	 char *line MY_ATTRIBUTE((unused)))

 {

   reg1 int i, j;

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

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

 	/* ARGSUSED */

 static int

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

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

 {

 #ifdef HAVE_READLINE

   if (status.add_to_history)

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

 	/* ARGSUSED */

 static int

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

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

 {

   char buff[256], *param;

   const CHARSET_INFO *new_cs;

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

 static int

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

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

 {

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

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

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

 }

 static int

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

-        char *line __attribute__((unused)))

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

+        char *line MY_ATTRIBUTE((unused)))

 {

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

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

 static int

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

-	  char *line __attribute__((unused)))

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

+	  char *line MY_ATTRIBUTE((unused)))

 {

   if (opt_outfile)

     end_tee();

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

 #ifdef USE_POPEN

 static int

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

-          char *line __attribute__((unused)))

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

+          char *line MY_ATTRIBUTE((unused)))

 {

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

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

 static int

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

-	    char *line __attribute__((unused)))

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

+	    char *line MY_ATTRIBUTE((unused)))

 {

   strmov(pager, "stdout");

   opt_nopager=1;

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

 #ifdef USE_POPEN

 static int

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

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

 {

   char	filename[FN_REFLEN],buff[160];

   int	fd,tmp;

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

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

 static int

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

-	 char *line __attribute__((unused)))

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

+	 char *line MY_ATTRIBUTE((unused)))

 {

   status.exit_status=0;

   return 1;

 }

 static int

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

-	 char *line __attribute__((unused)))

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

+	 char *line MY_ATTRIBUTE((unused)))

 {

 #ifdef HAVE_READLINE

   build_completion_hash(1, 0);

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

 #ifdef USE_POPEN

 static int

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

-          char *line __attribute__((unused)))

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

+          char *line MY_ATTRIBUTE((unused)))

 {

   char *shell_cmd;

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

 static int

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

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

 {

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

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

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

 }

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

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

                       char *line)

 {

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

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

 	/* ARGSUSED */

 static int

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

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

 {

   char buff[256], *tmp;

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

 	/* ARGSUSED */

 static int

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

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

 {

   char *tmp, buff[FN_REFLEN + 1];

   int select_db;

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

 }

 static int

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

-   char *line __attribute__((unused)))

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

+   char *line MY_ATTRIBUTE((unused)))

 {

   show_warnings = 1;

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

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

 }

 static int

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

-   char *line __attribute__((unused)))

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

+   char *line MY_ATTRIBUTE((unused)))

 {

   show_warnings = 0;

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

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

 static int

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

-	   char *line __attribute__((unused)))

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

+	   char *line MY_ATTRIBUTE((unused)))

 {

   const char *status_str;

   char buff[40];

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

   }

 }

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

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

                       char *line)

 {

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

--- a/client/mysql_config_editor.cc

+++ b/client/mysql_config_editor.cc

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

 /*

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

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

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

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

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

 my_bool

 my_program_get_one_option(int optid,

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

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

                           char *argument)

 {

   switch(optid) {

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

 my_bool

 my_set_command_get_one_option(int optid,

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

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

                               char *argument)

 {

   switch(optid) {

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

 my_bool

 my_remove_command_get_one_option(int optid,

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

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

                                  char *argument)

 {

   switch(optid) {

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

 my_bool

 my_print_command_get_one_option(int optid,

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

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

                                 char *argument)

 {

   switch(optid) {

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

 my_bool

 my_reset_command_get_one_option(int optid,

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

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

                                 char *argument)

 {

   switch(optid) {

--- a/client/mysql_plugin.c

+++ b/client/mysql_plugin.c

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

 /*

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

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

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

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

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

 static void usage(void)

 {

   PRINT_VERSION;

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

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

        "All rights reserved.\n");

   puts("Enable or disable plugins.");

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

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

 static my_bool

 get_one_option(int optid,

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

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

                char *argument)

 {

   switch(optid) {

--- a/client/mysqladmin.cc

+++ b/client/mysqladmin.cc

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

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

 my_bool

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

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

 	       char *argument)

 {

   int error = 0;

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

 }

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

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

 {

   interrupted=1;

 }

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

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

 static void print_row(MYSQL_RES *result, MYSQL_ROW cur,

-		      uint row __attribute__((unused)))

+		      uint row MY_ATTRIBUTE((unused)))

 {

   uint i,length;

   MYSQL_FIELD *field;

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

 }

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

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

 				    MYSQL_ROW cur,

-				    uint row __attribute__((unused)))

+				    uint row MY_ATTRIBUTE((unused)))

 {

   uint length;

   ulonglong tmp;

--- a/client/mysqlbinlog.cc

+++ b/client/mysqlbinlog.cc

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

 /*

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

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

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

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

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

 extern "C" my_bool

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

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

 	       char *argument)

 {

   bool tty_password=0;

--- a/client/mysqlcheck.c

+++ b/client/mysqlcheck.c

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

 static my_bool

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

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

 	       char *argument)

 {

   int orig_what_to_do= what_to_do;

--- a/client/mysqldump.c

+++ b/client/mysqldump.c

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

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

-                     my_bool not_used __attribute__((unused)))

+                     my_bool not_used MY_ATTRIBUTE((unused)))

 {

   *length= strlen(entry);

   return (uchar*) entry;

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

 static my_bool

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

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

                char *argument)

 {

   switch (optid) {

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

                           const char *str_create)

 {

   uint i;

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

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

   char *create_stmt_ptr= NULL;

   ulong create_stmt_len= 0;

   MYSQL_FIELD *field;

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

   0        Success.

   1        Failure.

 */

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

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

 {

     return 0;

 } /* init_dumping_views */

--- a/client/mysqlimport.c

+++ b/client/mysqlimport.c

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

 static my_bool

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

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

 	       char *argument)

 {

   switch(optid) {

--- a/client/mysqlshow.c

+++ b/client/mysqlshow.c

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

 static my_bool

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

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

 	       char *argument)

 {

   switch(optid) {

--- a/client/mysqlslap.c

+++ b/client/mysqlslap.c

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

 static my_bool

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

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

                char *argument)

 {

   DBUG_ENTER("get_one_option");

--- a/client/mysqltest.cc

+++ b/client/mysqltest.cc

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

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

 const char *from, int len);

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

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

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

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

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

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

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

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

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

   ATTRIBUTE_FORMAT(printf, 1, 2);

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

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

 C_MODE_START

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

-                          my_bool __attribute__((unused)) t)

+                          my_bool MY_ATTRIBUTE((unused)) t)

 {

   register char* key;

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

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

 }

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

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

 {

   static int SLAVE_POLL_INTERVAL= 300000;

   MYSQL* mysql = &cur_con->mysql;

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

 */

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

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

                    int line)

 {

   static ulonglong progress_start= 0; // < Beware

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

 void replace_strings_append(REPLACE *rep, DYNAMIC_STRING* ds,

                             const char *str,

-                            int len __attribute__((unused)))

+                            int len MY_ATTRIBUTE((unused)))

 {

   reg1 REPLACE *rep_pos;

   reg2 REPLACE_STRING *rep_str;

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

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

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

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

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

 # 

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

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

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

       SET(SUNPRO_CXX_LIBRARY "stlport4" CACHE STRING

         "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")