- rel 2; up to percona rel 30.0

[packages/mysql.git] / mysql_remove_eol_carret.patch

diff --git a/mysql_remove_eol_carret.patch b/mysql_remove_eol_carret.patch
index 4c3655fdb83e6f7637981558c39c6ec165f7c35a..c2767861d832a2537ceacaa31463dd2367607418 100644 (file)
--- a/mysql_remove_eol_carret.patch
+++ b/mysql_remove_eol_carret.patch
@@ -5,21 +5,19 @@
 #!!! 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-07-06 15:06:50.000000000 -0700
-+++ b/client/client_priv.h     2010-07-06 15:07:18.000000000 -0700
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -89,6 +89,7 @@
    OPT_SYSLOG,
  #endif
    OPT_PLUGIN_DIR,
 +  OPT_NO_REMOVE_EOL_CARRET,
+   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-06-03 08:50:02.000000000 -0700
-+++ b/client/mysql.cc  2010-07-06 15:07:18.000000000 -0700
-@@ -133,6 +133,8 @@
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -135,6 +135,8 @@
  enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
  typedef enum enum_info_type INFO_TYPE;
  
@@ -28,7 +26,7 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
  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,
-@@ -1450,6 +1452,10 @@
+@@ -1454,6 +1456,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},
@@ -39,11 +37,10 @@ diff -ruN a/client/mysql.cc b/client/mysql.cc
    {"unbuffered", 'n', "Flush buffer after each query.", &unbuffered,
     &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"column-names", OPT_COLUMN_NAMES, "Write column names in results.",
-diff -ruN a/client/readline.cc b/client/readline.cc
---- a/client/readline.cc       2010-06-03 08:50:23.000000000 -0700
-+++ b/client/readline.cc       2010-07-06 15:07:18.000000000 -0700
-@@ -20,6 +20,8 @@
- #include <m_string.h>
+--- a/client/readline.cc
++++ b/client/readline.cc
+@@ -23,6 +23,8 @@
+ #include <my_dir.h>
  #include "my_readline.h"
  
 +extern my_bool opt_no_remove_eol_carret;
@@ -51,8 +48,8 @@ diff -ruN a/client/readline.cc b/client/readline.cc
  static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
                            ulong max_size);
  static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str);
-@@ -51,7 +53,7 @@
-   if (!(pos=intern_read_line(line_buff,&out_length, truncated)))
+@@ -62,7 +64,7 @@
+   if (!(pos=intern_read_line(line_buff, &out_length)))
      return 0;
    if (out_length && pos[out_length-1] == '\n')
 -    if (--out_length && pos[out_length-1] == '\r')  /* Remove '\n' */
@@ -60,9 +57,8 @@ diff -ruN a/client/readline.cc b/client/readline.cc
        out_length--;                                 /* Remove '\r' */
    line_buff->read_length=out_length;
    pos[out_length]=0;
-diff -ruN a/patch_info/mysql_remove_eol_carret.patch b/patch_info/mysql_remove_eol_carret.patch
---- a/patch_info/mysql_remove_eol_carret.patch 1969-12-31 16:00:00.000000000 -0800
-+++ b/patch_info/mysql_remove_eol_carret.patch 2010-07-06 15:10:10.000000000 -0700
+--- /dev/null
++++ b/patch_info/mysql_remove_eol_carret.patch
 @@ -0,0 +1,7 @@
 +File=mysql_remove_eol_carret.patch
 +Name=