WL#1697: Multisource replication

 Merge from trunk

Author: Ritheesh Vedire

CMakeLists.txt

@@ -223,16 +223,14 @@ IF(DISABLE_SHARED)
   SET(WITHOUT_DYNAMIC_PLUGINS 1)
 ENDIF()
 OPTION(ENABLED_PROFILING "Enable profiling" ON)
-OPTION(CYBOZU "" OFF)
-OPTION(BACKUP_TEST "" OFF)
 OPTION(WITHOUT_SERVER OFF)
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
 ENDIF()
 IF(NOT WITHOUT_SERVER)
   OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 ENDIF()
-MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
+MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED)
 
 
 include(CheckCSourceCompiles)
@@ -417,11 +415,8 @@ IF(NOT CMAKE_BUILD_TYPE
     AND NOT CMAKE_GENERATOR MATCHES "Xcode") 
     # This is the case of no CMAKE_BUILD_TYPE choosen, typical for VS and Xcode
     # or if custom C flags are set. In VS and Xcode for non-Debug configurations 
-    # DBUG_OFF is already correctly set. Use DBUG_OFF for Makefile based projects 
-    # without build type too, unless user specifically requests DBUG. 
-    IF(NOT CMAKE_C_FLAGS MATCHES "-DDBUG_ON")
-      ADD_DEFINITIONS(-DDBUG_OFF)
-    ENDIF()
+    # DBUG_OFF is already correctly set.
+    ADD_DEFINITIONS(-DDBUG_OFF)
 ENDIF()
 
 # Add safemutex for debug configurations

client/client_priv.h

@@ -46,7 +46,7 @@ enum options_client
   OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
   OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
   OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
-  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
+  OPT_PROMPT, OPT_IGN_LINES, OPT_TRANSACTION, OPT_MYSQL_PROTOCOL,
   OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
   OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
   OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SET_GTID_PURGED, OPT_SERVER_ARG,
@@ -58,7 +58,7 @@ enum options_client
   OPT_USE_THREADS,
   OPT_IMPORT_USE_THREADS,
   OPT_MYSQL_NUMBER_OF_QUERY,
-  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
+  OPT_IGNORE_TABLE, OPT_INSERT_IGNORE, OPT_SHOW_WARNINGS, OPT_DROP_DATABASE,
   OPT_TZ_UTC, OPT_CREATE_SLAP_SCHEMA,
   OPT_MYSQLDUMP_SLAVE_APPLY,
   OPT_MYSQLDUMP_SLAVE_DATA,
@@ -125,3 +125,11 @@ enum options_client
 */
 #define PERFORMANCE_SCHEMA_DB_NAME "performance_schema"
 
+
+/**
+  Client deprecation warnings
+*/
+#define CLIENT_WARN_DEPRECATED_NO_REPLACEMENT(opt) \
+  printf("WARNING: " opt \
+         " is deprecated and will be removed in a future version\n")
+

client/mysql.cc

@@ -80,8 +80,6 @@ extern "C" {
 #if defined(HAVE_TERMIOS_H)
 #include <termios.h>
 #include <unistd.h>
-#elif defined(HAVE_TERMBITS_H)
-#include <termbits.h>
 #elif defined(HAVE_ASM_TERMBITS_H) && (!defined __GLIBC__ || !(__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ > 0))
 #include <asm/termbits.h>		// Standard linux
 #endif
@@ -670,7 +668,6 @@ static COMMANDS commands[] = {
   { "NUMERIC", 0, 0, 0, ""},
   { "NVARCHAR", 0, 0, 0, ""},
   { "OFFSET", 0, 0, 0, ""},
-  { "OLD_PASSWORD", 0, 0, 0, ""},
   { "ON", 0, 0, 0, ""},
   { "ONE", 0, 0, 0, ""},
   { "ONE_SHOT", 0, 0, 0, ""},
@@ -1124,7 +1121,7 @@ static void initialize_readline (char *name);
 
 static COMMANDS *find_command(char *name);
 static COMMANDS *find_command(char cmd_name);
-static bool add_line(String &buffer, char *line, ulong line_length,
+static bool add_line(String &buffer, char *line, size_t line_length,
                      char *in_string, bool *ml_comment, bool truncated);
 static void remove_cntrl(String &buffer);
 static void print_table_data(MYSQL_RES *result);
@@ -1410,13 +1407,22 @@ int main(int argc,char *argv[])
   if (opt_outfile)
     end_tee();
   mysql_end(0);
-#ifndef _lint
   DBUG_RETURN(0);				// Keep compiler happy
-#endif
 }
 
 void mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT, SIGINT and SIGHUP signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+  signal(SIGHUP, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&
@@ -1806,8 +1812,8 @@ static struct my_option my_long_options[] =
    &max_join_size, &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L,
    1, ULONG_MAX, 0, 1, 0},
   {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
-    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
-    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+    " uses old (pre-4.1.1) protocol. Deprecated. Always TRUE",
+    &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"server-arg", OPT_SERVER_ARG, "Send embedded server this as a parameter.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"show-warnings", OPT_SHOW_WARNINGS, "Show warnings after every statement.",
@@ -1941,6 +1947,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
                                     opt->name);
 #endif
     break;
+  case OPT_SECURE_AUTH:
+    CLIENT_WARN_DEPRECATED_NO_REPLACEMENT("--secure-auth");
+    if (!opt_secure_auth)
+    {
+      usage(0);
+      exit(1);
+    }
+    break;
   case OPT_SERVER_ARG:
 #ifdef EMBEDDED_LIBRARY
     /*
@@ -2443,7 +2457,7 @@ static COMMANDS *find_command(char *name)
 }
 
 
-static bool add_line(String &buffer, char *line, ulong line_length,
+static bool add_line(String &buffer, char *line, size_t line_length,
                      char *in_string, bool *ml_comment, bool truncated)
 {
   uchar inchar;
@@ -3845,10 +3859,10 @@ print_table_data(MYSQL_RES *result)
     for (uint off=0; (field = mysql_fetch_field(result)) ; off++)
     {
       size_t name_length= strlen(field->name);
-      uint numcells= charset_info->cset->numcells(charset_info,
-                                                  field->name,
-                                                  field->name + name_length);
-      uint display_length= field->max_length + name_length - numcells;
+      size_t numcells= charset_info->cset->numcells(charset_info,
+                                                    field->name,
+                                                    field->name + name_length);
+      size_t display_length= field->max_length + name_length - numcells;
       tee_fprintf(PAGER, " %-*s |",
                   min<int>(display_length, MAX_COLUMN_LENGTH),
                   field->name);
@@ -4966,9 +4980,6 @@ init_connection_options(MYSQL *mysql)
   if (opt_compress)
     mysql_options(mysql, MYSQL_OPT_COMPRESS, NullS);
 
-  if (!opt_secure_auth)
-    mysql_options(mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth);
-
   if (using_opt_local_infile)
     mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile);
 

client/mysql_secure_installation.cc

@@ -604,6 +604,7 @@ int get_root_password()
         the temporary password file.
       */
       char *temp_pass;
+      init_connection_options(&mysql);
       if (find_temporary_password(&temp_pass) == TRUE)
       {
         my_free(password);

client/mysqladmin.cc

@@ -108,7 +108,7 @@ enum commands {
   ADMIN_FLUSH_HOSTS,      ADMIN_FLUSH_TABLES,    ADMIN_PASSWORD,
   ADMIN_PING,             ADMIN_EXTENDED_STATUS, ADMIN_FLUSH_STATUS,
   ADMIN_FLUSH_PRIVILEGES, ADMIN_START_SLAVE,     ADMIN_STOP_SLAVE,
-  ADMIN_FLUSH_THREADS,    ADMIN_OLD_PASSWORD
+  ADMIN_FLUSH_THREADS
 };
 static const char *command_names[]= {
   "create",               "drop",                "shutdown",
@@ -118,7 +118,7 @@ static const char *command_names[]= {
   "flush-hosts",          "flush-tables",        "password",
   "ping",                 "extended-status",     "flush-status",
   "flush-privileges",     "start-slave",         "stop-slave",
-  "flush-threads","old-password",
+  "flush-threads",
   NullS
 };
 
@@ -194,8 +194,8 @@ static struct my_option my_long_options[] =
    &opt_relative, &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
   {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
-   " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
-   &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+    " uses old (pre-4.1.1) protocol. Deprecated. Always TRUE",
+    &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -317,6 +317,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case OPT_ENABLE_CLEARTEXT_PLUGIN:
     using_opt_enable_cleartext_plugin= TRUE;
     break;
+  case OPT_SECURE_AUTH:
+    CLIENT_WARN_DEPRECATED_NO_REPLACEMENT("--secure-auth");
+    if (!opt_secure_auth)
+    {
+      usage();
+      exit(1);
+    }
+    break;
   }
   if (error)
   {
@@ -370,8 +378,6 @@ int main(int argc,char *argv[])
 
   if (opt_bind_addr)
     mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
-  if (!opt_secure_auth)
-    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
   if (opt_compress)
     mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
   if (opt_connect_timeout)
@@ -403,8 +409,7 @@ int main(int argc,char *argv[])
                   (char*) &opt_enable_cleartext_plugin);
 
   first_command= find_type(argv[0], &command_typelib, FIND_TYPE_BASIC);
-  can_handle_passwords= 
-    (first_command == ADMIN_PASSWORD || first_command == ADMIN_OLD_PASSWORD) ?
+  can_handle_passwords= first_command == ADMIN_PASSWORD ?
     TRUE : FALSE;
   mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
                 &can_handle_passwords);
@@ -1008,16 +1013,12 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       }
       break;
     }
-    case ADMIN_OLD_PASSWORD:
     case ADMIN_PASSWORD:
     {
       char buff[128],crypted_pw[64];
       time_t start_time;
       char *typed_password= NULL, *verified= NULL;
       bool log_off= true, err= false;
-      int retry_count= 0;                       /* Attempts to SET PASSWORD */
-
-      bool old= (option == ADMIN_OLD_PASSWORD);
 
       /* Do initialization the same way as we do in mysqld */
       start_time=time((time_t*) 0);
@@ -1055,66 +1056,23 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
           printf("Warning: single quotes were not trimmed from the password by"
                  " your command\nline client, as you might have expected.\n");
 #endif
-        /*
-           If we don't already know to use an old-style password, see
-           (if possible) what the server is using.
-        */
-        if (!old)
+        /* turn logging off if we can */
+        if (mysql_query(mysql, "set sql_log_off=1"))
         {
-          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'"))
-          {
-            bool fatal= (mysql_errno(mysql) != ER_MUST_CHANGE_PASSWORD);
-            if (fatal || opt_verbose)
-              my_printf_error(0, "Could not determine old_passwords setting "
-                              "from server; error: '%s'.", error_flags,
-                              mysql_error(mysql));
-            if (fatal)
-            {
-              err= true;
-              goto error;
-            }
-          }
-          else
-          {
-            MYSQL_RES *res= mysql_store_result(mysql);
-            if (!res)
-            {
-              my_printf_error(0,
-                              "Could not get old_passwords setting from "
-                              "server; error: '%s'.",
-                              error_flags, mysql_error(mysql));
-              err= true;
-              goto error;
-            }
-            if (!mysql_num_rows(res))
-              old= 1;
-            else
-            {
-              MYSQL_ROW row= mysql_fetch_row(res);
-              old= (!strncmp(row[1], "ON", 2) || !strncmp(row[1], "1", 1));
-            }
-            mysql_free_result(res);
-          }
+          if (opt_verbose)
+            fprintf(stderr, "Note: Can't turn off logging; '%s'", mysql_error(mysql));
+          log_off= false;
         }
-      /* turn logging off if we can */
-      if (mysql_query(mysql,"set sql_log_off=1"))
-      {
-        if (opt_verbose)
-          fprintf(stderr, "Note: Can't turn off logging; '%s'", mysql_error(mysql));
-        log_off= false;
-      }
 
-retry:
         /*
           In case the password_expired flag is set ('Y'), then there is no way
-          to determine the password format. So, we first try to set the
-          password using native format. If it fails with ER_PASSWORD_LENGTH,
-          we will give one more try with old format.
+          to determine the password format. So, assume that setting the
+          password using the server's default authentication format
+          (mysql_native_password) will work.
+          TODO: make sure this always uses SSL and then let the server
+          calculate the scramble.
         */
-        if (old)
-          make_scrambled_password_323(crypted_pw, typed_password);
-        else
-          make_scrambled_password(crypted_pw, typed_password);
+        make_scrambled_password(crypted_pw, typed_password);
       }
       else
 	crypted_pw[0]=0;			/* No password */
@@ -1123,16 +1081,6 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 
       if (mysql_query(mysql,buff))
       {
-        if ((mysql_errno(mysql) == ER_PASSWD_LENGTH) &&
-            !(option == ADMIN_OLD_PASSWORD) && !retry_count)
-        {
-          /* Try to set the password using old format. */
-          memset(crypted_pw, 0, 64);
-          old= 0;
-          retry_count ++;
-          goto retry;
-        }
-
 	if (mysql_errno(mysql)!=1290)
 	{
 	  my_printf_error(0,"unable to change password; error: '%s'",
@@ -1264,8 +1212,7 @@ static char **mask_password(int argc, char ***argv)
   while (argc > 0)
   {
     temp_argv[argc]= my_strdup(PSI_NOT_INSTRUMENTED, (*argv)[argc], MYF(MY_FAE));
-    if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
-        find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
+    if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD)
     {
       char *start= (*argv)[argc];
       while (*start)