MERGE: mysql-trunk-->mysql-trunk-wl5766

Author: mayprasa

CMakeLists.txt

@@ -267,6 +267,28 @@ OPTION(OPTIMIZER_TRACE "Support tracing of Optimizer" ON)
 OPTION(INNODB_COMPILER_HINTS "Compile InnoDB with compiler hints" ON)
 MARK_AS_ADVANCED(INNODB_COMPILER_HINTS)
 
+#
+# Options related to client-side protocol tracing
+#
+
+OPTION(WITH_CLIENT_PROTOCOL_TRACING
+  "Support for client-side protocol tracing plugins" ON)
+OPTION(WITH_TEST_TRACE_PLUGIN
+  "Have a built-in test protocol trace plugin in libmysql (requires WITH_CLIENT_PROTOCOL_TRACING option)" OFF)
+
+# Sanity checks for protocol tracing options
+
+IF(WITH_TEST_TRACE_PLUGIN AND NOT WITH_CLIENT_PROTOCOL_TRACING)
+MESSAGE("WARNING: Test trace plugin was selected but client protocol tracing infrastructure is not enabled - ignoring")
+SET(WITH_TEST_TRACE_PLUGIN 0)
+ENDIF()
+
+IF(WITH_TEST_TRACE_PLUGIN AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  MESSAGE(SEND_ERROR 
+          "Test trace plugin was selected but it can be included only in debug binaries.
+          Set WITH_TEST_TRACE_PLUGIN to OFF or WITH_DEBUG to ON.")
+ENDIF()
+
 # Set DBUG_OFF and other optional release-only flags for non-debug project types
 FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
   FOREACH(LANG C CXX)

client/completion_hash.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, 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
@@ -41,15 +41,16 @@ uint hashpjw(const char *arKey, uint nKeyLength)
 
 int completion_hash_init(HashTable *ht, uint nSize)
 {
-  ht->arBuckets = (Bucket **) my_malloc(nSize* sizeof(Bucket *),
+  ht->arBuckets = (Bucket **) my_malloc(PSI_NOT_INSTRUMENTED,
+                                        nSize* sizeof(Bucket *),
 					MYF(MY_ZEROFILL | MY_WME));
 
   if (!ht->arBuckets)
   {
     ht->initialized = 0;
     return FAILURE;
   }
-  init_alloc_root(&ht->mem_root, 8192, 0);
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &ht->mem_root, 8192, 0);
   ht->pHashFunction = hashpjw;
   ht->nTableSize = nSize;
   ht->initialized = 1;

client/get_password.c

@@ -205,7 +205,12 @@ char *get_tty_password_ext(const char *opt_message,
 
 #endif /* _WIN32 */
 
+static char * my_strdup_fct(const char *str, myf flags)
+{
+  return my_strdup(PSI_NOT_INSTRUMENTED, str, flags);
+}
+
 char *get_tty_password(const char *opt_message)
 {
-  return get_tty_password_ext(opt_message, my_strdup);
+  return get_tty_password_ext(opt_message, my_strdup_fct);
 }

client/mysql.cc

@@ -1210,10 +1210,12 @@ int main(int argc,char *argv[])
   charset_index= get_command_index('C');
   delimiter_index= get_command_index('d');
   delimiter_str= delimiter;
-  default_prompt = my_strdup(getenv("MYSQL_PS1") ? 
+  default_prompt = my_strdup(PSI_NOT_INSTRUMENTED,
+                             getenv("MYSQL_PS1") ? 
 			     getenv("MYSQL_PS1") : 
 			     "mysql> ",MYF(MY_WME));
-  current_prompt = my_strdup(default_prompt,MYF(MY_WME));
+  current_prompt = my_strdup(PSI_NOT_INSTRUMENTED,
+                             default_prompt,MYF(MY_WME));
   prompt_counter=0;
 
   outfile[0]=0;			// no (default) outfile
@@ -1288,7 +1290,7 @@ int main(int argc,char *argv[])
   }
   glob_buffer.realloc(512);
   completion_hash_init(&ht, 128);
-  init_alloc_root(&hash_mem_root, 16384, 0);
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &hash_mem_root, 16384, 0);
   memset(&mysql, 0, sizeof(mysql));
   if (sql_connect(current_host,current_db,current_user,opt_password,
 		  opt_silent))
@@ -1355,10 +1357,12 @@ int main(int argc,char *argv[])
 
     /* read-history from file, default ~/.mysql_history*/
     if (getenv("MYSQL_HISTFILE"))
-      histfile=my_strdup(getenv("MYSQL_HISTFILE"),MYF(MY_WME));
+      histfile=my_strdup(PSI_NOT_INSTRUMENTED,
+                         getenv("MYSQL_HISTFILE"),MYF(MY_WME));
     else if (getenv("HOME"))
     {
-      histfile=(char*) my_malloc((uint) strlen(getenv("HOME"))
+      histfile=(char*) my_malloc(PSI_NOT_INSTRUMENTED,
+                                 (uint) strlen(getenv("HOME"))
 				 + (uint) strlen("/.mysql_history")+2,
 				 MYF(MY_WME));
       if (histfile)
@@ -1382,7 +1386,8 @@ int main(int argc,char *argv[])
       if (verbose)
 	tee_fprintf(stdout, "Reading history-file %s\n",histfile);
       read_history(histfile);
-      if (!(histfile_tmp= (char*) my_malloc((uint) strlen(histfile) + 5,
+      if (!(histfile_tmp= (char*) my_malloc(PSI_NOT_INSTRUMENTED,
+                                            (uint) strlen(histfile) + 5,
 					    MYF(MY_WME))))
       {
 	fprintf(stderr, "Couldn't allocate memory for temp histfile!\n");
@@ -1939,7 +1944,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     }
     if (embedded_server_arg_count == MAX_SERVER_ARGS-1 ||
         !(embedded_server_args[embedded_server_arg_count++]=
-          my_strdup(argument, MYF(MY_FAE))))
+          my_strdup(PSI_NOT_INSTRUMENTED,
+                    argument, MYF(MY_FAE))))
     {
         put_info("Can't use server argument", INFO_ERROR);
         return 0;
@@ -1985,7 +1991,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     {
       char *start= argument;
       my_free(opt_password);
-      opt_password= my_strdup(argument, MYF(MY_FAE));
+      opt_password= my_strdup(PSI_NOT_INSTRUMENTED,
+                              argument, MYF(MY_FAE));
       while (*argument) *argument++= 'x';		// Destroy argument
       if (*start)
 	start[1]=0 ;
@@ -2041,7 +2048,8 @@ static int get_options(int argc, char **argv)
 
   tmp= (char *) getenv("MYSQL_HOST");
   if (tmp)
-    current_host= my_strdup(tmp, MYF(MY_WME));
+    current_host= my_strdup(PSI_NOT_INSTRUMENTED,
+                            tmp, MYF(MY_WME));
 
   pagpoint= getenv("PAGER");
   if (!((char*) (pagpoint)))
@@ -2082,7 +2090,8 @@ static int get_options(int argc, char **argv)
   {
     skip_updates= 0;
     my_free(current_db);
-    current_db= my_strdup(*argv, MYF(MY_WME));
+    current_db= my_strdup(PSI_NOT_INSTRUMENTED,
+                          *argv, MYF(MY_WME));
   }
   if (tty_password)
     opt_password= get_tty_password(NullS);
@@ -2104,6 +2113,12 @@ static int read_and_execute(bool interactive)
   String buffer;
 #endif
 
+  /*
+    line can be allocated by:
+    - batch_readline. Use my_free()
+    - my_win_console_readline. Do not free, see tmpbuf.
+    - readline. Use free()
+  */
   char	*line= NULL;
   char	in_string=0;
   ulong line_number=0;
@@ -2207,7 +2222,7 @@ static int read_and_execute(bool interactive)
         free the previous entered line.
       */
       if (line)
-        my_free(line);
+        free(line);
       line= readline(prompt);
 
       if (sigint_received)
@@ -2282,7 +2297,7 @@ static int read_and_execute(bool interactive)
     /*
       free the last entered line.
     */
-    my_free(line);
+    free(line);
 #endif
 
   /*
@@ -3213,7 +3228,8 @@ static void get_current_db()
   {
     MYSQL_ROW row= mysql_fetch_row(res);
     if (row && row[0])
-      current_db= my_strdup(row[0], MYF(MY_WME));
+      current_db= my_strdup(PSI_NOT_INSTRUMENTED,
+                            row[0], MYF(MY_WME));
     mysql_free_result(res);
   }
 }
@@ -4452,12 +4468,14 @@ com_connect(String *buffer, char *line)
     if (tmp && *tmp)
     {
       my_free(current_db);
-      current_db= my_strdup(tmp, MYF(MY_WME));
+      current_db= my_strdup(PSI_NOT_INSTRUMENTED,
+                            tmp, MYF(MY_WME));
       tmp= get_arg(buff, 1);
       if (tmp)
       {
 	my_free(current_host);
-	current_host=my_strdup(tmp,MYF(MY_WME));
+	current_host=my_strdup(PSI_NOT_INSTRUMENTED,
+                               tmp,MYF(MY_WME));
       }
     }
     else
@@ -4645,7 +4663,8 @@ com_use(String *buffer __attribute__((unused)), char *line)
         return put_error(&mysql);
     }
     my_free(current_db);
-    current_db=my_strdup(tmp,MYF(MY_WME));
+    current_db=my_strdup(PSI_NOT_INSTRUMENTED,
+                         tmp,MYF(MY_WME));
 #ifdef HAVE_READLINE
     if (select_db > 1)
       build_completion_hash(opt_rehash, 1);
@@ -5158,7 +5177,8 @@ server_version_string(MYSQL *con)
         /* version, space, comment, \0 */
         size_t len= strlen(mysql_get_server_info(con)) + strlen(cur[0]) + 2;
 
-        if ((server_version= (char *) my_malloc(len, MYF(MY_WME))))
+        if ((server_version= (char *) my_malloc(PSI_NOT_INSTRUMENTED,
+                                                len, MYF(MY_WME))))
         {
           char *bufp;
           bufp = strmov(server_version, mysql_get_server_info(con));
@@ -5175,7 +5195,8 @@ server_version_string(MYSQL *con)
     */
 
     if (server_version == NULL)
-      server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME));
+      server_version= my_strdup(PSI_NOT_INSTRUMENTED,
+                                mysql_get_server_info(con), MYF(MY_WME));
   }
 
   return server_version ? server_version : "";
@@ -5649,8 +5670,10 @@ static void init_username()
       (result=mysql_use_result(&mysql)))
   {
     MYSQL_ROW cur=mysql_fetch_row(result);
-    full_username=my_strdup(cur[0],MYF(MY_WME));
-    part_username=my_strdup(strtok(cur[0],"@"),MYF(MY_WME));
+    full_username=my_strdup(PSI_NOT_INSTRUMENTED,
+                            cur[0],MYF(MY_WME));
+    part_username=my_strdup(PSI_NOT_INSTRUMENTED,
+                            strtok(cur[0],"@"),MYF(MY_WME));
     (void) mysql_fetch_row(result);		// Read eof
   }
 }
@@ -5689,15 +5712,17 @@ static void get_current_os_user() {
        !(user= getenv("LOGIN")))
     user= "UNKNOWN USER";
 #endif                                          /* _WIN32 */
-  current_os_user= my_strdup(user, MYF(MY_WME));
+  current_os_user= my_strdup(PSI_NOT_INSTRUMENTED,
+                             user, MYF(MY_WME));
   return;
 }
 
 // Get the current OS sudo user name (only for non-Windows platforms).
 static void get_current_os_sudouser() {
 #ifndef _WIN32
   if (getenv("SUDO_USER"))
-   current_os_sudouser= my_strdup(getenv("SUDO_USER"), MYF(MY_WME));
+   current_os_sudouser= my_strdup(PSI_NOT_INSTRUMENTED,
+                                  getenv("SUDO_USER"), MYF(MY_WME));
 #endif                                          /* !_WIN32 */
   return;
 }
@@ -5708,7 +5733,8 @@ static int com_prompt(String *buffer __attribute__((unused)),
   char *ptr=strchr(line, ' ');
   prompt_counter = 0;
   my_free(current_prompt);
-  current_prompt=my_strdup(ptr ? ptr+1 : default_prompt,MYF(MY_WME));
+  current_prompt=my_strdup(PSI_NOT_INSTRUMENTED,
+                           ptr ? ptr+1 : default_prompt,MYF(MY_WME));
   if (!ptr)
     tee_fprintf(stdout, "Returning to default PROMPT of %s\n", default_prompt);
   else

client/mysql_config_editor.cc

@@ -404,7 +404,8 @@ static int do_handle_options(int argc, char *argv[])
     exit(1);
   }
 
-  if (!(ptr= (char *) my_malloc((argc + 2) * sizeof(char *),
+  if (!(ptr= (char *) my_malloc(PSI_NOT_INSTRUMENTED,
+                                (argc + 2) * sizeof(char *),
                                 MYF(MY_WME))))
     goto error;
 
@@ -456,7 +457,8 @@ static int do_handle_options(int argc, char *argv[])
 
   /* If NULL, set it to 'client' (default) */
   if (!opt_login_path)
-    opt_login_path= my_strdup("client", MYF(MY_WME));
+    opt_login_path= my_strdup(PSI_NOT_INSTRUMENTED,
+                              "client", MYF(MY_WME));
 
 done:
   my_free(ptr);
@@ -980,7 +982,8 @@ static void remove_option(DYNAMIC_STRING *file_buf, const char *path_name,
   int search_len, shift_len;
   bool option_found= FALSE;
 
-  search_str= (char *) my_malloc((uint) strlen(option_name) + 2, MYF(MY_WME));
+  search_str= (char *) my_malloc(PSI_NOT_INSTRUMENTED,
+                                 (uint) strlen(option_name) + 2, MYF(MY_WME));
   sprintf(search_str, "\n%s", option_name);
 
   if ((start= locate_login_path(file_buf, path_name)) == NULL)