- disable response-time-distribution patch on arch which has no atomic builtins even...

[packages/mysql.git] / mysql_syslog.patch

diff --git a/mysql_syslog.patch b/mysql_syslog.patch
index 861efddace88b7243d90c0f3974cfd2d22b41043..ac219cfc6d2ef0cf8fcc1a58d4a016f8d719e119 100644 (file)
--- a/mysql_syslog.patch
+++ b/mysql_syslog.patch
@@ -6,9 +6,9 @@
 # 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     2011-01-13 18:35:59.000000000 +0300
-+++ b/client/client_priv.h     2011-01-13 18:38:21.000000000 +0300
-@@ -85,6 +85,9 @@
+--- a/client/client_priv.h     2011-04-09 18:48:18.000000000 +0400
++++ b/client/client_priv.h     2011-04-09 18:48:54.000000000 +0400
+@@ -82,6 +82,9 @@
    OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
    OPT_WRITE_BINLOG, OPT_DUMP_DATE,
    OPT_INIT_COMMAND,
@@ -16,11 +16,11 @@ diff -ruN a/client/client_priv.h b/client/client_priv.h
 +  OPT_SYSLOG,
 +#endif
    OPT_PLUGIN_DIR,
+   OPT_DEFAULT_AUTH,
    OPT_DEFAULT_PLUGIN,
-   OPT_MAX_CLIENT_OPTION
 diff -ruN a/client/mysql.cc b/client/mysql.cc
---- a/client/mysql.cc  2010-12-03 20:58:26.000000000 +0300
-+++ b/client/mysql.cc  2011-01-13 18:38:21.000000000 +0300
+--- a/client/mysql.cc  2011-04-09 18:48:04.000000000 +0400
++++ b/client/mysql.cc  2011-04-09 18:48:54.000000000 +0400
 @@ -38,6 +38,11 @@
  #include "my_readline.h"
  #include <signal.h>
@@ -50,7 +50,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
  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 +1567,10 @@
+@@ -1563,6 +1569,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},
@@ -61,7 +61,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
    {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
     (uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-@@ -1665,6 +1675,11 @@
+@@ -1667,6 +1677,11 @@
                                      opt->name);
  #endif
      break;
@@ -73,7 +73,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
    case OPT_SERVER_ARG:
  #ifdef EMBEDDED_LIBRARY
      /*
-@@ -2014,6 +2029,40 @@
+@@ -2020,6 +2035,40 @@
    DBUG_RETURN((COMMANDS *) 0);
  }
  
@@ -114,7 +114,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
  
  static bool add_line(String &buffer,char *line,char *in_string,
                       bool *ml_comment, bool truncated)
-@@ -2990,6 +3039,11 @@
+@@ -2996,6 +3045,11 @@
      fix_history(buffer);
    }
  #endif