- rel. 2

[packages/mysql.git] / mysql_syslog.patch

diff --git a/mysql_syslog.patch b/mysql_syslog.patch
index 861efddace88b7243d90c0f3974cfd2d22b41043..061187654cf7d9cf9bc3adddad862115d85fc375 100644 (file)
--- a/mysql_syslog.patch
+++ b/mysql_syslog.patch
@@ -5,9 +5,8 @@
 #!!! 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     2011-01-13 18:35:59.000000000 +0300
-+++ b/client/client_priv.h     2011-01-13 18:38:21.000000000 +0300
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -85,6 +85,9 @@
    OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
    OPT_WRITE_BINLOG, OPT_DUMP_DATE,
@@ -16,12 +15,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
-@@ -38,6 +38,11 @@
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -40,6 +40,11 @@
  #include "my_readline.h"
  #include <signal.h>
  #include <violite.h>
@@ -33,7 +31,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
  
  #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
  #include <locale.h>
-@@ -140,7 +145,7 @@
+@@ -142,7 +147,7 @@
                 default_pager_set= 0, opt_sigint_ignore= 0,
                 auto_vertical_output= 0,
                 show_warnings= 0, executing_query= 0, interrupted_query= 0,
@@ -42,7 +40,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
  static my_bool debug_info_flag, debug_check_flag;
  static my_bool column_types_flag;
  static my_bool preserve_comments= 0;
-@@ -198,6 +203,7 @@
+@@ -200,6 +205,7 @@
  void tee_fputs(const char *s, FILE *file);
  void tee_puts(const char *s, FILE *file);
  void tee_putc(int c, FILE *file);
@@ -50,7 +48,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 @@
+@@ -1565,6 +1571,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},
@@ -59,9 +57,9 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
 +   NO_ARG, 0, 0, 0, 0, 0, 0},
 +#endif
    {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
-    (uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
+     &opt_plugin_dir, &opt_plugin_dir, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-@@ -1665,6 +1675,11 @@
+@@ -1669,6 +1679,11 @@
                                      opt->name);
  #endif
      break;
@@ -73,7 +71,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
    case OPT_SERVER_ARG:
  #ifdef EMBEDDED_LIBRARY
      /*
-@@ -2014,6 +2029,40 @@
+@@ -2022,6 +2037,40 @@
    DBUG_RETURN((COMMANDS *) 0);
  }
  
@@ -114,7 +112,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 @@
+@@ -2998,6 +3047,11 @@
      fix_history(buffer);
    }
  #endif