#!!! 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>
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 */
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);
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)
{
/*
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;
}
}
/* continue with header of the errmsg.sys file */
-@@ -500,14 +525,26 @@
+@@ -501,14 +526,26 @@
DBUG_RETURN(0);
continue;
}
/* add error to the list */
*tail_error= current_error;
-@@ -848,78 +885,122 @@
+@@ -849,78 +886,122 @@
DBUG_RETURN(new_message);
}