- rel 2; patches updated

[packages/mysql.git] / error_pad.patch

diff --git a/error_pad.patch b/error_pad.patch
index 55619db7fb4b35c8b022a0164d8bfe3dc2305fe7..87d396aa82b7d208640968b00ccabc1dc9e8ee51 100644 (file)
--- a/error_pad.patch
+++ b/error_pad.patch
@@ -5,10 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/extra/comp_err.c b/extra/comp_err.c
---- a/extra/comp_err.c 2010-08-03 17:24:24.000000000 +0000
-+++ b/extra/comp_err.c 2010-09-14 16:49:28.000000000 +0000
-@@ -30,11 +30,12 @@
+--- a/extra/comp_err.c
++++ b/extra/comp_err.c
+@@ -32,11 +32,12 @@
  #include <assert.h>
  #include <my_dir.h>
  
@@ -22,7 +21,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
  static char *OUTFILE= (char*) "errmsg.sys";
  static char *HEADERFILE= (char*) "mysqld_error.h";
  static char *NAMEFILE= (char*) "mysqld_ername.h";
-@@ -89,6 +90,7 @@
+@@ -91,6 +92,7 @@
    const char *sql_code1;              /* sql state */
    const char *sql_code2;              /* ODBC state */
    struct errors *next_error;            /* Pointer to next error */
@@ -30,7 +29,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
    DYNAMIC_ARRAY msg;                    /* All language texts for this error */
  };
  
-@@ -127,6 +129,7 @@
+@@ -129,6 +131,7 @@
  
  
  static struct languages *parse_charset_string(char *str);
@@ -38,7 +37,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
  static struct errors *parse_error_string(char *ptr, int er_count);
  static struct message *parse_message_string(struct message *new_message,
                                            char *str);
-@@ -252,6 +255,11 @@
+@@ -253,6 +256,11 @@
  
    for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
    {
@@ -50,7 +49,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
      /*
         generating mysqld_error.h
         fprintf() will automatically add \r on windows
-@@ -344,12 +352,29 @@
+@@ -345,12 +353,29 @@
                "language\n", tmp_error->er_name, tmp_lang->lang_short_name);
        goto err;
        }
@@ -84,7 +83,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
      }
  
      /* continue with header of the errmsg.sys file */
-@@ -500,14 +525,26 @@
+@@ -501,14 +526,26 @@
        DBUG_RETURN(0);
        continue;
      }
@@ -98,7 +97,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
 -      DBUG_RETURN(0);
 +        if (!(current_error= parse_padd_string(str, rcount)))
 +        {
-+          fprintf(stderr, "Failed to parse the error padd string\n");
++          fprintf(stderr, "Failed to parse the error pad string\n");
 +          DBUG_RETURN(0);
 +        }
 +        rcount= current_error->d_code - er_offset;  /* Count number of unique errors */
@@ -116,7 +115,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
  
        /* add error to the list */
        *tail_error= current_error;
-@@ -848,78 +885,122 @@
+@@ -849,78 +886,122 @@
    DBUG_RETURN(new_message);
  }
  
@@ -174,7 +173,7 @@ diff -ruN a/extra/comp_err.c b/extra/comp_err.c
 -  if (!(new_error->er_name= get_word(&str)))
 +  if (!(d_code= parse_error_offset(start)))
 +  {
-+    fprintf(stderr, "Failed to parse the error padd string '%s' '%s' (d_code doesn't parse)!\n",er_name,str);
++    fprintf(stderr, "Failed to parse the error pad string '%s' '%s' (d_code doesn't parse)!\n",er_name,str);
 +    DBUG_RETURN(0);
 +  }
 +  if (d_code < (uint)(er_offset + er_count))