Merge lp:~percona-dev/percona-server/5.1.54-syslog-from-maria into lp:percona-server/release-5.1.54-12

[Oleg Tsarev]

Propogate updates from Oleksandr Byelkin for mysql-syslog.patch.
Just a code and code style fixes (without any functional changes).
Now patch should build on Window platform

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'COPYING.mysql-syslog.patch'
--- COPYING.mysql-syslog.patch	1970-01-01 00:00:00 +0000
+++ COPYING.mysql-syslog.patch	2011-01-10 13:49:30 +0000
@@ -0,0 +1,30 @@
+Portions of this software contain modifications contributed by Oleksandr Byelkin
+These contributions are used with the following license:
+
+Copyright (c) 2010, Oleksandr Byelkin All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+      * Neither the name of the Oleksandr Byelkin nor the names of its
+        contributors may be used to endorse or promote products
+        derived from this software without specific prior written
+        permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== modified file 'mysql-syslog.patch'
--- mysql-syslog.patch	2010-12-14 20:03:02 +0000
+++ mysql-syslog.patch	2011-01-10 13:49:30 +0000
@@ -5,20 +5,22 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/client/client_priv.h b/client/client_priv.h
---- a/client/client_priv.h	2010-08-08 14:12:42.229338865 +0400
-+++ b/client/client_priv.h	2010-08-08 14:12:43.068089277 +0400
-@@ -90,6 +90,7 @@
+diff -ruN a/client/client_priv.h c/client/client_priv.h
+--- a/client/client_priv.h	2011-01-07 18:46:05.000000000 +0300
++++ c/client/client_priv.h	2011-01-07 18:53:03.000000000 +0300
+@@ -90,6 +90,9 @@
    OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
    OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
    OPT_WRITE_BINLOG, OPT_DUMP_DATE,
++#ifndef __WIN__
 +  OPT_SYSLOG,
++#endif
    OPT_FIRST_SLAVE,
    OPT_ALL,
    OPT_MAX_CLIENT_OPTION
-diff -ruN a/client/mysql.cc b/client/mysql.cc
---- a/client/mysql.cc	2010-08-08 14:12:42.229338865 +0400
-+++ b/client/mysql.cc	2010-08-08 14:12:43.488088866 +0400
+diff -ruN a/client/mysql.cc c/client/mysql.cc
+--- a/client/mysql.cc	2010-11-29 13:37:59.000000000 +0300
++++ c/client/mysql.cc	2011-01-07 18:57:05.000000000 +0300
 @@ -43,6 +43,9 @@
  #include "my_readline.h"
  #include <signal.h>
@@ -29,24 +31,33 @@
  
  #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
  #include <locale.h>
-@@ -151,7 +154,7 @@
+@@ -62,6 +65,8 @@
+ /* Version numbers for deprecation messages */
+ #define VER_CELOSIA "5.6"
+ 
++#define MAX_SYSLOG_MESSAGE 900
++
+ void* sql_alloc(unsigned size);	     // Don't use mysqld alloc for these
+ void sql_element_free(void *ptr);
+ #include "sql_string.h"
+@@ -151,7 +156,7 @@
  	       default_charset_used= 0, opt_secure_auth= 0,
                 default_pager_set= 0, opt_sigint_ignore= 0,
                 show_warnings= 0, executing_query= 0, interrupted_query= 0,
 -               ignore_spaces= 0;
-+               opt_syslog=0, ignore_spaces= 0;
++               ignore_spaces= 0, opt_syslog= 0;
  static my_bool debug_info_flag, debug_check_flag;
  static my_bool column_types_flag;
  static my_bool preserve_comments= 0;
-@@ -206,6 +209,7 @@
+@@ -206,6 +211,7 @@
  void tee_fputs(const char *s, FILE *file);
  void tee_puts(const char *s, FILE *file);
  void tee_putc(int c, FILE *file);
-+void write_syslog(char *line);
++void write_syslog(String *buffer);
  static void tee_print_sized_data(const char *, unsigned int, unsigned int, bool);
  /* The names of functions that actually do the manipulation. */
  static int get_options(int argc,char **argv);
-@@ -1561,6 +1565,10 @@
+@@ -1561,6 +1567,10 @@
    {"show-warnings", OPT_SHOW_WARNINGS, "Show warnings after every statement.",
      &show_warnings, &show_warnings, 0, GET_BOOL, NO_ARG,
      0, 0, 0, 0, 0, 0},
@@ -57,66 +68,66 @@
    { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
  };
  
-@@ -1684,6 +1692,12 @@
+@@ -1684,6 +1694,11 @@
                                      opt->name);
  #endif
      break;
++#ifndef __WIN__
 +  case OPT_SYSLOG:
-+    /*if (connect_flag == CLIENT_INTERACTIVE){
-+      printf("Logging queries to syslog.\n");
-+    }*/
 +    opt_syslog = 1;
 +    break;
++#endif
    case OPT_SERVER_ARG:
  #ifdef EMBEDDED_LIBRARY
      /*
-@@ -2060,6 +2074,39 @@
+@@ -2060,6 +2075,40 @@
    DBUG_RETURN((COMMANDS *) 0);
  }
  
-+void write_syslog(char *line){
++void write_syslog(String *line){
 +#ifndef __WIN__
-+  char buff[901];
-+  uint i, buff_pos=0;
-+  for (i=0;i < strlen(line); i++){
-+    buff[buff_pos] = line[i];
-+    buff_pos++;
-+    if (buff_pos >= 900){
-+      buff[900] = 0;
-+      buff_pos = 0;
-+      syslog(LOG_INFO, "SYSTEM_USER:%s, MYSQL_USER:%s, CONNECTION_ID:%lu, DB_SERVER:%s, DB:%s, QUERY:%s",
-+             getenv("SUDO_USER") ? getenv("SUDO_USER") :
-+             getenv("USER") ? getenv("USER") : "--",
-+             current_user ? current_user : "--",
-+             mysql_thread_id(&mysql),
-+             current_host ? current_host : "--",
-+             current_db ? current_db : "--",
-+             buff);
++  uint length= line->length();
++  uint chunk_len= min(MAX_SYSLOG_MESSAGE, length);
++  char *ptr= line->c_ptr_safe();
++  char buff[MAX_SYSLOG_MESSAGE + 1];
++
++  for (;
++       length;
++       length-= chunk_len, ptr+= chunk_len, chunk_len= min(MAX_SYSLOG_MESSAGE,
++                                                           length))
++  {
++    char *str;
++    if (length == chunk_len)
++      str= ptr;                                 // last chunk => skip copy
++    else
++    {
++      memcpy(buff, ptr, chunk_len);
++      buff[chunk_len]= '\0';
++      str= buff;
 +    }
-+  }
-+  if (buff_pos > 0){
-+    buff[buff_pos] = 0;
-+    syslog(LOG_INFO, "SYSTEM_USER:%s, MYSQL_USER:%s, CONNECTION_ID:%lu, DB_SERVER:%s, DB:%s, QUERY:%s",
-+           getenv("SUDO_USER") ? getenv("SUDO_USER") :
++    syslog(LOG_INFO,
++           "SYSTEM_USER:'%s', MYSQL_USER:'%s', CONNECTION_ID:%lu, "
++           "DB_SERVER:'%s', DB:'%s', QUERY:'%s'",
++           getenv("SUDO_USER") ? getenv("SUDO_USER") : 
 +           getenv("USER") ? getenv("USER") : "--",
 +           current_user ? current_user : "--",
 +           mysql_thread_id(&mysql),
 +           current_host ? current_host : "--",
 +           current_db ? current_db : "--",
-+           buff);
++           str);
 +  }
 +#endif
 +}
  
  static bool add_line(String &buffer,char *line,char *in_string,
                       bool *ml_comment, bool truncated)
-@@ -3031,6 +3078,11 @@
+@@ -3031,6 +3080,11 @@
      fix_history(buffer);
    }
  #endif
 +#ifndef __WIN__
 +  if (opt_syslog && buffer->length() && connect_flag == CLIENT_INTERACTIVE){
-+    write_syslog(buffer->c_ptr());
++    write_syslog(buffer);
 +  }
 +#endif
  

=== modified file 'mysql_remove_eol_carret.patch'
--- mysql_remove_eol_carret.patch	2010-12-14 20:03:02 +0000
+++ mysql_remove_eol_carret.patch	2011-01-10 13:49:30 +0000
@@ -8,8 +8,8 @@
 diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2010-07-06 15:06:50.000000000 -0700
 +++ b/client/client_priv.h	2010-07-06 15:07:18.000000000 -0700
-@@ -93,5 +93,6 @@
-   OPT_SYSLOG,
+@@ -95,5 +95,6 @@
+ #endif
    OPT_FIRST_SLAVE,
    OPT_ALL,
 +  OPT_NO_REMOVE_EOL_CARRET,
@@ -18,7 +18,7 @@
 diff -ruN a/client/mysql.cc b/client/mysql.cc
 --- a/client/mysql.cc	2010-06-03 08:50:02.000000000 -0700
 +++ b/client/mysql.cc	2010-07-06 15:07:18.000000000 -0700
-@@ -143,6 +143,8 @@
+@@ -145,6 +145,8 @@
  enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
  typedef enum enum_info_type INFO_TYPE;
  
@@ -27,7 +27,7 @@
  static MYSQL mysql;			/* The connection */
  static my_bool ignore_errors=0,wait_flag=0,quick=0,
                 connected=0,opt_raw_data=0,unbuffered=0,output_tables=0,
-@@ -1437,6 +1439,10 @@
+@@ -1439,6 +1441,10 @@
     NO_ARG, 1, 0, 0, 0, 0, 0},  
    {"skip-line-numbers", 'L', "Don't write line number for errors.", 0, 0, 0, GET_NO_ARG,
     NO_ARG, 0, 0, 0, 0, 0, 0},

=== modified file 'profiling_slow.patch'
--- profiling_slow.patch	2010-12-22 20:15:33 +0000
+++ profiling_slow.patch	2011-01-10 13:49:30 +0000
@@ -95,9 +95,9 @@
 diff -ruN a/sql/log.cc b/sql/log.cc
 --- a/sql/log.cc	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/log.cc	2010-11-24 19:36:29.000000000 +0300
-@@ -2433,6 +2433,11 @@
+@@ -2434,6 +2434,11 @@
            my_b_printf(&log_file,"# No InnoDB statistics available for this query\n") == (uint) -1)
-         tmp_errno=errno;
+         tmp_errno= errno;
      }
 +
 +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-12-22 20:15:33 +0000
+++ response-time-distribution.patch	2011-01-10 13:49:30 +0000
@@ -755,7 +755,7 @@
    case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
    case SCH_USER_PRIVILEGES:
    case SCH_SCHEMA_PRIVILEGES:
-@@ -7234,6 +7250,12 @@
+@@ -7235,6 +7251,12 @@
      init_global_index_stats();
      pthread_mutex_unlock(&LOCK_global_index_stats);
    }

=== modified file 'show_slave_status_nolock.patch'
--- show_slave_status_nolock.patch	2010-12-17 19:06:49 +0000
+++ show_slave_status_nolock.patch	2011-01-10 13:49:30 +0000
@@ -61,7 +61,7 @@
    sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
-@@ -2545,12 +2546,16 @@
+@@ -2546,12 +2547,16 @@
      pthread_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -79,7 +79,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2561,7 +2566,10 @@
+@@ -2562,7 +2567,10 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }

=== modified file 'show_temp_51.patch'
--- show_temp_51.patch	2010-12-16 11:35:26 +0000
+++ show_temp_51.patch	2011-01-10 13:49:30 +0000
@@ -50,7 +50,7 @@
    case SCH_VIEWS:
    case SCH_TRIGGERS:
    case SCH_EVENTS:
-@@ -2317,6 +2322,7 @@
+@@ -2318,6 +2323,7 @@
    }
    case SQLCOM_SHOW_DATABASES:
    case SQLCOM_SHOW_TABLES:
@@ -58,7 +58,7 @@
    case SQLCOM_SHOW_TRIGGERS:
    case SQLCOM_SHOW_TABLE_STATUS:
    case SQLCOM_SHOW_OPEN_TABLES:
-@@ -5457,6 +5463,8 @@
+@@ -5458,6 +5464,8 @@
  
    case SCH_TABLE_NAMES:
    case SCH_TABLES:

=== modified file 'userstat.patch'
--- userstat.patch	2011-01-04 11:30:51 +0000
+++ userstat.patch	2011-01-10 13:49:30 +0000
@@ -436,7 +436,7 @@
  
  /*
    Log slow query with all enabled log event handlers
-@@ -4495,6 +4517,8 @@
+@@ -4496,6 +4518,8 @@
                               thd->first_successful_insert_id_in_prev_stmt_for_binlog);
            if (e.write(file))
              goto err;
@@ -445,7 +445,7 @@
          }
          if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
          {
-@@ -4506,12 +4530,16 @@
+@@ -4507,12 +4531,16 @@
                               minimum());
            if (e.write(file))
              goto err;
@@ -462,7 +462,7 @@
          }
          if (thd->user_var_events.elements)
          {
-@@ -4527,6 +4555,8 @@
+@@ -4528,6 +4556,8 @@
                                   user_var_event->charset_number);
              if (e.write(file))
                goto err;
@@ -471,7 +471,7 @@
            }
          }
        }
-@@ -4539,6 +4569,8 @@
+@@ -4540,6 +4570,8 @@
      if (event_info->write(file) || 
          DBUG_EVALUATE_IF("injecting_fault_writing", 1, 0))
        goto err;
@@ -480,7 +480,7 @@
  
      if (file == &log_file) // we are writing to the real log (disk)
      {
-@@ -4684,7 +4716,7 @@
+@@ -4685,7 +4717,7 @@
      be reset as a READ_CACHE to be able to read the contents from it.
   */
  
@@ -489,7 +489,7 @@
  {
    Mutex_sentry sentry(lock_log ? &LOCK_log : NULL);
  
-@@ -4732,6 +4764,7 @@
+@@ -4733,6 +4765,7 @@
        /* write the first half of the split header */
        if (my_b_write(&log_file, header, carry))
          return ER_ERROR_ON_WRITE;
@@ -497,7 +497,7 @@
  
        /*
          copy fixed second half of header to cache so the correct
-@@ -4800,6 +4833,7 @@
+@@ -4801,6 +4834,7 @@
      /* Write data to the binary log file */
      if (my_b_write(&log_file, cache->read_pos, length))
        return ER_ERROR_ON_WRITE;
@@ -505,7 +505,7 @@
      cache->read_pos=cache->read_end;		// Mark buffer used up
    } while ((length= my_b_fill(cache)));
  
-@@ -4922,21 +4956,24 @@
+@@ -4923,21 +4957,24 @@
        */
        if (qinfo.write(&log_file))
          goto err;
@@ -984,7 +984,7 @@
    uint32     server_id;
    uint32     file_id;			// for LOAD DATA INFILE
    /* remote (peer) port */
-@@ -1828,6 +1830,8 @@
+@@ -1833,6 +1835,8 @@
    /* variables.transaction_isolation is reset to this after each commit */
    enum_tx_isolation session_tx_isolation;
    enum_check_fields count_cuted_fields;
@@ -993,7 +993,7 @@
  
    DYNAMIC_ARRAY user_var_events;        /* For user variables replication */
    MEM_ROOT      *user_var_events_alloc; /* Allocate above array elements here */
-@@ -1916,6 +1920,49 @@
+@@ -1921,6 +1925,49 @@
    */
    LOG_INFO*  current_linfo;
    NET*       slave_net;			// network connection from slave -> m.
@@ -1043,7 +1043,7 @@
    /* Used by the sys_var class to store temporary values */
    union
    {
-@@ -1981,6 +2028,11 @@
+@@ -1986,6 +2033,11 @@
      alloc_root. 
    */
    void init_for_queries();
@@ -1055,7 +1055,7 @@
    void change_user(void);
    void cleanup(void);
    void cleanup_after_query();
-@@ -2351,9 +2403,15 @@
+@@ -2356,9 +2408,15 @@
      *p_db= strmake(db, db_length);
      *p_db_length= db_length;
      return FALSE;
@@ -1071,7 +1071,7 @@
  public:
    inline Internal_error_handler *get_internal_handler()
    { return m_internal_handler; }
-@@ -2437,6 +2495,9 @@
+@@ -2442,6 +2500,9 @@
    LEX_STRING invoker_host;
  };
  
@@ -1854,7 +1854,7 @@
        my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
        DBUG_RETURN(TRUE);
      }
-@@ -5348,6 +5368,7 @@
+@@ -5349,6 +5369,7 @@
        if (!no_errors)
        {
          const char *db_name= db ? db : thd->db;
@@ -1862,7 +1862,7 @@
          my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                   sctx->priv_user, sctx->priv_host, db_name);
        }
-@@ -5380,12 +5401,15 @@
+@@ -5381,12 +5402,15 @@
    {						// We can never grant this
      DBUG_PRINT("error",("No possible access"));
      if (!no_errors)
@@ -1878,7 +1878,7 @@
      DBUG_RETURN(TRUE);				/* purecov: tested */
    }
  
-@@ -5411,11 +5435,15 @@
+@@ -5412,11 +5436,15 @@
  
    DBUG_PRINT("error",("Access denied"));
    if (!no_errors)
@@ -1894,7 +1894,7 @@
    DBUG_RETURN(TRUE);				/* purecov: tested */
  }
  
-@@ -5444,6 +5472,7 @@
+@@ -5445,6 +5473,7 @@
  
      if (!thd->col_access && check_grant_db(thd, dst_db_name))
      {
@@ -1902,7 +1902,7 @@
        my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                 thd->security_ctx->priv_user,
                 thd->security_ctx->priv_host,
-@@ -5525,9 +5554,12 @@
+@@ -5526,9 +5555,12 @@
          (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
      {
        if (!no_errors)
@@ -1915,7 +1915,7 @@
        return TRUE;
      }
      /*
-@@ -5690,6 +5722,7 @@
+@@ -5691,6 +5723,7 @@
    if ((thd->security_ctx->master_access & want_access))
      return 0;
    get_privilege_desc(command, sizeof(command), want_access);
@@ -1923,7 +1923,7 @@
    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
    return 1;
  #else
-@@ -6071,6 +6104,30 @@
+@@ -6072,6 +6105,30 @@
    lex_start(thd);
    mysql_reset_thd_for_next_command(thd);
  
@@ -1954,7 +1954,7 @@
    if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
    {
      LEX *lex= thd->lex;
-@@ -6151,6 +6208,43 @@
+@@ -6152,6 +6209,43 @@
      *found_semicolon= NULL;
    }
  
@@ -1998,7 +1998,7 @@
    DBUG_VOID_RETURN;
  }
  
-@@ -7016,6 +7110,13 @@
+@@ -7017,6 +7111,13 @@
      if (flush_error_log())
        result=1;
    }
@@ -2012,7 +2012,7 @@
  #ifdef HAVE_QUERY_CACHE
    if (options & REFRESH_QUERY_CACHE_FREE)
    {
-@@ -7116,6 +7217,40 @@
+@@ -7117,6 +7218,40 @@
  #endif
   if (options & REFRESH_USER_RESOURCES)
     reset_mqh((LEX_USER *) NULL, 0);             /* purecov: inspected */