Preparing to support character set in error messages

24 files changed, 73 insertions, 0 deletions

diff --git a/extra/comp_err.c b/extra/comp_err.c
index 806fb5052b4..175dc246f5f 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -24,11 +24,13 @@
 #define MAXLENGTH 1000
 #define MAX_ROWS  1000
 #define MAX_FILES 10
+#define MAX_CHARSET_NAME	64
 
 int	row_count;
 uint	file_pos[MAX_ROWS],file_row_pos[MAX_FILES];
 my_string saved_row[MAX_ROWS];
 uchar   file_head[]= { 254,254,2,1 };
+char    charset_name[MAX_CHARSET_NAME];
 
 static void get_options(int *argc,char **argv[]);
 static int count_rows(FILE *from,pchar c, pchar c2);
@@ -61,6 +63,13 @@ int main(int argc,char *argv[])
     }
 
     VOID(count_rows(from,'"','}'));	/* Calculate start-info */
+    if (!charset_name[0])
+    {
+      fprintf(stderr,"Character set is not specified in '%s'\n",*argv);
+      fclose(from);
+      goto end;
+    }
+    
     if (remember_rows(from,'}') < 0)	/* Remember rows */
     {
       fprintf(stderr,"Can't find textrows in '%s'\n",*argv);
@@ -134,6 +143,11 @@ static void get_options(register int *argc,register char **argv[])
     case 'V':
       printf("%s  (Compile errormessage)  Ver 1.3\n",progname);
       break;
+    case 'C':
+      printf("pos=%s\n", pos+1);
+      charsets_dir= pos+1;
+      *(pos--)= '\0';
+      break;
     case 'I':
     case '?':
       printf("         %s  (Compile errormessage)  Ver 1.3\n",progname);
@@ -168,8 +182,19 @@ static int count_rows(FILE *from, pchar c, pchar c2)
   DBUG_ENTER("count_rows");
 
   pos=ftell(from); count=0;
+  
+  charset_name[0]= '\0';
   while (fgets(rad,MAXLENGTH,from) != NULL)
   {
+    if (!strncmp(rad,"character-set=",14))
+    {
+      char *b= rad+14, *e;
+      for (e=b ; e[0] && e-b < MAX_CHARSET_NAME && 
+                 e[0] != ' '  && e[0] != '\r' && 
+                 e[0] != '\n' && e[0] != '\t' ; e++);
+      e[0]= '\0';
+      strcpy(charset_name, b);
+    }
     if (rad[0] == c || rad[0] == c2)
       break;
     count++;
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index e920a2139db..de7f1b43d26 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -10,6 +10,8 @@
 	Thu Nov 30 14:02:52 MET 2000		podle 3.23.28
 */
 
+character-set=latin2
+
 "hashchk",
 "isamchk",
 "NE",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index beea26d5f51..68a383df01e 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -4,6 +4,8 @@
 /* Knud Riishøjgård knudriis@post.tele.dk 99 &&
    Carsten H. Pedersen, carsten.pedersen@bitbybit.dk oct. 1999 / aug. 2001. */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NEJ",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 6eca86deba2..1ccfd0d3cd6 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -12,6 +12,8 @@
    Translated new error messages.
 */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NEE",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 8b9ed103cbb..a8ed1f95ff7 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NO",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index b4c17303ef0..5fcd5c830e8 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -6,6 +6,8 @@
 
 */
 
+character-set=latin7
+
 "hashchk",
 "isamchk",
 "EI",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 9f321a908b6..cf8f38ec774 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NON",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index b5b47091035..20edc56f4c8 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -10,6 +10,8 @@
    2002-12-11	
 		*/
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "Nein",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index cf6f45eea84..39429a9b0a3 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=greek
+
 "hashchk",
 "isamchk",
 "Ï×É",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 43dcfcd16d3..511f1e21743 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -3,6 +3,8 @@
    Updated May, 2000
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=latin2
+
 "hashchk",
 "isamchk",
 "NEM",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 125dca5310e..04011bc252e 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NO",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 1b73380df1c..944932e0d94 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -3,6 +3,8 @@
    3.22.10-beta   euc-japanese (ujis) text
 */
 
+character-set=ujis
+
 "hashchk",
 "isamchk",
 "NO",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index a32a8f1033e..642d78887ed 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This È­ÀÏ is public domain and comes with NO WARRANTY of any kind */
 
+character-set=euckr
+
 "hashchk",
 "isamchk",
 "¾Æ´Ï¿À",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 83da00a5955..94992e2ef04 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -3,6 +3,8 @@
 
 /* Roy-Magne Mo rmo@www.hivolda.no 97 */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NEI",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 81cfad7e494..7da21c399eb 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -3,6 +3,8 @@
 
 /* Roy-Magne Mo rmo@www.hivolda.no 97 */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NEI",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 69b9c898ae7..adcdb536780 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -5,6 +5,8 @@
    Charset ISO-8859-2
 */
 
+character-set=latin2
+
 "hashchk",
 "isamchk",
 "NIE",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 2862e8036dc..af4e210a5b7 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -1,6 +1,9 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 /* Updated by Thiago Delgado Pinto - thiagodp@ieg.com.br - 06.07.2002 */
+
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NÃO",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 0591a082490..5b6fb9e4911 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -5,6 +5,8 @@
    e-mail: tzoompy@cs.washington.edu
 */
 
+character-set=latin2
+
 "hashchk",
 "isamchk",
 "NU",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index fe276396d92..ea9b8265b77 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -3,6 +3,8 @@
    This file is public domain and comes with NO WARRANTY of any kind */
 /* charset: KOI8-R */
 
+character-set=koi8r
+
 "hashchk",
 "isamchk",
 "îåô",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 5869fa62c04..bb18a14c946 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -7,6 +7,8 @@
    Charset: cp1250
 */
 
+character-set=cp1250
+
 "hashchk",
 "isamchk",
 "NE",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 9cf4d874339..09f0517fd15 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -9,6 +9,8 @@
    Date:           Streda 11. November 1998 20:58:15
 */
 
+character-set=latin2
+
 "hashchk",
 "isamchk",
 "NIE",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 72f4249b4c9..7a4dea69e0b 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -2,6 +2,9 @@
    This file is public domain and comes with NO WARRANTY of any kind
    Traduccion por Miguel Angel Fernandez Roiz -- LoboCom Sistemas, s.l.
    From June 28, 2001 translated by Miguel Solorzano miguel@mysql.com */
+
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NO",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index cf7859712ee..d1c14bf7e4e 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -1,6 +1,8 @@
 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
+character-set=latin1
+
 "hashchk",
 "isamchk",
 "NO",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 2e7a01d9573..8bd060781bb 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -6,6 +6,8 @@
  *  Version:	13/09/2001 mysql-3.23.41
  */
 
+character-set=koi8u
+
 "hashchk",
 "isamchk",
 "î¶",