List:Commits« Previous MessageNext Message »
From:Alexey Botchkov Date:December 9 2008 12:11pm
Subject:bzr commit into mysql-5.1-bugteam branch (holyfoot:2732) Bug#37995
View as plain text  
#At file:///home/hf/work/mysql_common/37995/directory_123456789012345678901234567890/directory_123456789012345678901234567890/directory_123456789012345678901234567890/37995/

 2732 Alexey Botchkov	2008-12-09
      Bug#37995      Error message truncation in test "innodb" in embedded mode
              as embedded-server specifies the complete file path in the error message,
              the current buffer of 256 can be easily overrun, so the error message will
              be cut. That leads to failing tests as the error message doesn't coincide.
      
              Error buffer increased. It's not an ultimate solution, still fixes the issue
              on the foreseenable perspective. And i think it's good to do anyway as
              now the error message limit is 512 in the client, so cutting the message at
              256 looks weird.
      
      per-file comments:
        include/my_sys.h
      Bug#37995      Error message truncation in test "innodb" in embedded mode
              error message buffer increased
        sql/share/errmsg.txt
      Bug#37995      Error message truncation in test "innodb" in embedded mode
              filename in the error message can safely take up to 210 symbols.
modified:
  include/my_sys.h
  sql/share/errmsg.txt

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2008-08-23 02:47:43 +0000
+++ b/include/my_sys.h	2008-12-09 12:03:57 +0000
@@ -39,7 +39,7 @@ extern int NEAR my_errno;		/* Last error
 #define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}
 #define MY_INIT(name);		{ my_progname= name; my_init(); }
 
-#define ERRMSGSIZE	(SC_MAXWIDTH)	/* Max length of a error message */
+#define ERRMSGSIZE	(SC_MAXWIDTH * 2)	/* Max length of a error message */
 #define NRERRBUFFS	(2)	/* Buffers for parameters */
 #define MY_FILE_ERROR	((size_t) -1)
 

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2008-11-20 07:51:48 +0000
+++ b/sql/share/errmsg.txt	2008-12-09 12:03:57 +0000
@@ -571,30 +571,30 @@ ER_ERROR_ON_READ  
         swe "Fick fel vid l�ing av '%-.200s' (Felkod %d)"
         ukr "��� ���ME  
-        cze "Chyba p-B�ejmenov� '%-.150s' na '%-.150s' (chybov� %d)"
-        dan "Fejl ved omd�g af '%-.150s' til '%-.150s' (Fejlkode: %d)"
-        nla "Fout bij het hernoemen van '%-.150s' naar '%-.150s' (Errcode: %d)"
-        eng "Error on rename of '%-.150s' to '%-.150s' (errno: %d)"
-        jps "'%-.150s' ��-.150s' ��rename �ł��܂���rrno: %d)",
-        est "Viga faili '%-.150s' �imetamisel '%-.150s'-ks (veakood: %d)"
-        fre "Erreur en renommant '%-.150s' en '%-.150s' (Errcode: %d)"
-        ger "Fehler beim Umbenennen von '%-.150s' in '%-.150s' (Fehler: %d)"
-        greek "�� ������� ����-.150s' to '%-.150s' (�����d)"
-        hun "Hiba a '%-.150s' file atnevezesekor '%-.150s'. (hibakod: %d)"
-        ita "Errore durante la rinominazione da '%-.150s' a '%-.150s' (errno: %d)"
-        jpn "'%-.150s' ��-.150s' ��rename �Ǥ��ޤ���rrno: %d)"
-        kor "'%-.150s'�� '%-.150s'����� ��� ved omd� av '%-.150s' til '%-.150s' (Feilkode: %d)"
-        norwegian-ny "Feil ved omd�g av '%-.150s' til '%-.150s' (Feilkode: %d)"
-        pol "B�?d podczas zmieniania nazwy '%-.150s' na '%-.150s' (Kod b��: %d)"
-        por "Erro ao renomear '%-.150s' para '%-.150s' (erro no. %d)"
-        rum "Eroare incercind sa renumesc '%-.150s' in '%-.150s' (errno: %d)"
-        rus "������������ '%-.150s' �'%-.150s' (�%-.150s' na '%-.150s' (errno: %d)"
-        slo "Chyba pri premenov�n�%-.150s' na '%-.150s' (chybov� %d)"
-        spa "Error en el renombrado de '%-.150s' a '%-.150s' (Error: %d)"
-        swe "Kan inte byta namn fr�'%-.150s' till '%-.150s' (Felkod: %d)"
-        ukr "��� %d)"
+        cze "Chyba p-B�ejmenov� '%-.210s' na '%-.210s' (chybov� %d)"
+        dan "Fejl ved omda "Fout bij het hernoemen van '%-.210s' naar '%-.210s' (Errcode: %d)"
+        eng "Error on rename of '%-.210s' to '%-.210s' (errno: %d)"
+        jps "'%-.210s' ��-.210s' ��rename �ł��܂���rrno: %d)",
+        est "Viga faili '%-.210s' �imetamisel '%-.210s'-ks (veakood: %d)"
+        fre "Erreur en renommant '%-.210s' en '%-.210s' (Errcode: %d)"
+        ger "Fehler beim Umbenennen von '%-.210s' in '%-.210s' (Fehler: %d)"
+        greek "�� ������� ����-.210s' to '%-.210s' (�����d)"
+        hun "Hiba a '%-.210s' file atnevezesekor '%-.210s'. (hibakod: %d)"
+        ita "Errore durante la rinominazione da '%-.210s' a '%-.210s' (errno: %d)"
+        jpn "'%-.210s' ��-.210s' ��rename �Ǥ��ޤ���rrno: %d)"
+        kor "'%-.210s'�� '%-.210s'����� ��Feil ved omd� av '%-.210s' til '%-.210s' (Feilkode: %d)"
+        norwegian-ny "Feil ved omd�g av '%-.210s' til '%-.210s' (Feilkode: %d)"
+        pol "B�?d podczas zmieniania nazwy '%-.210s' na '%-.210s' (Kod b��: %d)"
+        por "Erro ao renomear '%-.210s' para '%-.210s' (erro no. %d)"
+        rum "Eroare incercind sa renumesc '%-.210s' in '%-.210s' (errno: %d)"
+        rus "�na '%-.210s' na '%-.210s' (errno: %d)"
+        slo "Chyba pri premenov�n�%-.210s' na '%-.210s' (chybov� %d)"
+        spa "Error en el renombrado de '%-.210s' a '%-.210s' (Error: %d)"
+        swe "Kan inte byta namn fr�� �������'%-.210s' �'%-.210s' (�B�pisu do souboru '%-.200s' (chybov� %d)"
         dan "Fejl ved skriving av filen '%-.200s' (Fejlkode: %d)"

Thread
bzr commit into mysql-5.1-bugteam branch (holyfoot:2732) Bug#37995Alexey Botchkov9 Dec
  • Re: bzr commit into mysql-5.1-bugteam branch (holyfoot:2732) Bug#37995Davi Arnaut28 Jan