Merge sinisa@work.mysql.com:/home/bk/mysql

into sinisa.nasamreza.org:/mnt/work/mysql sql/share/polish/errmsg.txt: Auto merged

Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql sql/share/polish/errmsg.txt: Auto merged
469c998b · unknown · ed47a1da · 0d3b0c39 · 469c998b · 469c998b
Commit 469c998b authored Feb 25, 2003 by unknown
24 changed files
--- a/innobase/ibuf/ibuf0ibuf.c
+++ b/innobase/ibuf/ibuf0ibuf.c
@@ -2483,7 +2483,9 @@ ibuf_merge_or_delete_for_page(
 	ulint		old_bits;
 	ulint		new_bits;
 	dulint		max_trx_id;
+	ibool		corruption_noticed	= FALSE;
 	mtr_t		mtr;
+	char		err_buf[500];
 	if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
@@ -2535,7 +2537,38 @@ ibuf_merge_or_delete_for_page(
 		block = buf_block_align(page);
 		rw_lock_x_lock_move_ownership(&(block->lock));
-		ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX);
+		if (fil_page_get_type(page) != FIL_PAGE_INDEX) {
+			corruption_noticed = TRUE;
+			ut_print_timestamp(stderr);
+			mtr_start(&mtr);
+			fprintf(stderr,
+"  InnoDB: Dump of the ibuf bitmap page:\n");
+			bitmap_page = ibuf_bitmap_get_map_page(space, page_no,
+									&mtr);
+			buf_page_print(bitmap_page);
+			mtr_commit(&mtr);
+			fprintf(stderr, "\nInnoDB: Dump of the page:\n");
+			buf_page_print(page);
+			fprintf(stderr,
+"InnoDB: Error: corruption in the tablespace. Bitmap shows insert\n"
+"InnoDB: buffer records to page n:o %lu though the page\n"
+"InnoDB: type is %lu, which is not an index page!\n"
+"InnoDB: We try to resolve the problem by skipping the insert buffer\n"
+"InnoDB: merge for this page. Please run CHECK TABLE on your tables\n"
+"InnoDB: to determine if they are corrupt after this.\n\n"
+"InnoDB: Please make a detailed bug report and send it to\n"
+"InnoDB: mysql@lists.mysql.com\n\n",
+				page_no, fil_page_get_type(page));
+		}
 	}
 	n_inserts = 0;
@@ -2578,8 +2611,14 @@ loop:
 			goto reset_bit;
 		}
+		if (corruption_noticed) {
+			rec_sprintf(err_buf, 450, ibuf_rec);
+			fprintf(stderr,
+"InnoDB: Discarding record\n %s\n from the insert buffer!\n\n", err_buf);
-	   	if (page) {
+	   	} else if (page) {
 			/* Now we have at pcur a record which should be
 			inserted to the index page; NOTE that the call below
 			copies pointers to fields in ibuf_rec, and we must

--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
 /*
-   Modifikoval Petr -Bnajdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
+   Modifikoval Petr -Bnajdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01
 	ISO LATIN-8852-2
-   Dal-B verze Jan Pazdziora, adelton@fi.muni.cz-A
+   Dal-B verze Jan Pazdziora, adelton@fi.muni.cz
 	Tue Nov 18 17:53:55 MET 1997
 	Tue Dec  2 19:08:54 MET 1997		podle 3.21.15c
 	Thu May  7 17:40:49 MET DST 1998	podle 3.21.29
@@ -14,200 +14,200 @@
 "isamchk",
 "NE",
 "ANO",
-"Nemohu vytvo-Bit soubor '%-.64s' (chybov kd: %d)",-A
+"Nemohu vytvo-Bit soubor '%-.64s' (chybov kd: %d)",
-"Nemohu vytvo-Bit tabulku '%-.64s' (chybov kd: %d)",-A
+"Nemohu vytvo-Bit tabulku '%-.64s' (chybov kd: %d)",
-"Nemohu vytvo-Bit databzi '%-.64s', chyba %d",-A
+"Nemohu vytvo-Bit databzi '%-.64s', chyba %d",
-"Nemohu vytvo-Bit databzi '%-.64s', databze ji existuje",-A
+"Nemohu vytvo-Bit databzi '%-.64s', databze ji existuje",
-"Nemohu zru-Bit databzi '%-.64s', databze neexistuje",-A
+"Nemohu zru-Bit databzi '%-.64s', databze neexistuje",
-"Chyba p-Bi ruen databze (nemohu vymazat '%-.64s', chyba %d)",-A
+"Chyba p-Bi ruen databze (nemohu vymazat '%-.64s', chyba %d)",
-"Chyba p-Bi ruen databze (nemohu vymazat adres '%-.64s', chyba %d)",-A
+"Chyba p-Bi ruen databze (nemohu vymazat adres '%-.64s', chyba %d)",
-"Chyba p-Bi vmazu '%-.64s' (chybov kd: %d)",-A
+"Chyba p-Bi vmazu '%-.64s' (chybov kd: %d)",
-"Nemohu -Bst zznam v systmov tabulce",-A
+"Nemohu -Bst zznam v systmov tabulce",
-"Nemohu z-Bskat stav '%-.64s' (chybov kd: %d)",-A
+"Nemohu z-Bskat stav '%-.64s' (chybov kd: %d)",
-"Chyba p-Bi zjiovn pracovn adres (chybov kd: %d)",-A
+"Chyba p-Bi zjiovn pracovn adres (chybov kd: %d)",
-"Nemohu uzamknout soubor (chybov-B kd: %d)",-A
+"Nemohu uzamknout soubor (chybov-B kd: %d)",
-"Nemohu otev-Bt soubor '%-.64s' (chybov kd: %d)",-A
+"Nemohu otev-Bt soubor '%-.64s' (chybov kd: %d)",
-"Nemohu naj-Bt soubor '%-.64s' (chybov kd: %d)",-A
+"Nemohu naj-Bt soubor '%-.64s' (chybov kd: %d)",
-"Nemohu -Bst adres '%-.64s' (chybov kd: %d)",-A
+"Nemohu -Bst adres '%-.64s' (chybov kd: %d)",
-"Nemohu zm-Bnit adres na '%-.64s' (chybov kd: %d)",-A
+"Nemohu zm-Bnit adres na '%-.64s' (chybov kd: %d)",
-"Z-Bznam byl zmnn od poslednho ten v tabulce '%-.64s'",-A
+"Z-Bznam byl zmnn od poslednho ten v tabulce '%-.64s'",
-"Disk je pln-B (%s), ekm na uvolnn njakho msta ...",-A
+"Disk je pln-B (%s), ekm na uvolnn njakho msta ...",
-"Nemohu zapsat, zdvojen-B kl v tabulce '%-.64s'",-A
+"Nemohu zapsat, zdvojen-B kl v tabulce '%-.64s'",
-"Chyba p-Bi zavrn '%-.64s' (chybov kd: %d)",-A
+"Chyba p-Bi zavrn '%-.64s' (chybov kd: %d)",
-"Chyba p-Bi ten souboru '%-.64s' (chybov kd: %d)",-A
+"Chyba p-Bi ten souboru '%-.64s' (chybov kd: %d)",
-"Chyba p-Bi pejmenovn '%-.64s' na '%-.64s' (chybov kd: %d)",-A
+"Chyba p-Bi pejmenovn '%-.64s' na '%-.64s' (chybov kd: %d)",
-"Chyba p-Bi zpisu do souboru '%-.64s' (chybov kd: %d)",-A
+"Chyba p-Bi zpisu do souboru '%-.64s' (chybov kd: %d)",
-"'%-.64s' je zam-Ben proti zmnm",-A
+"'%-.64s' je zam-Ben proti zmnm",
-"T-Bdn perueno",-A
+"T-Bdn perueno",
 "Pohled '%-.64s' pro '%-.64s' neexistuje",
-"Obsluha tabulky vr-Btila chybu %d",-A
+"Obsluha tabulky vr-Btila chybu %d",
-"Obsluha tabulky '%-.64s' nem-B tento parametr",-A
+"Obsluha tabulky '%-.64s' nem-B tento parametr",
-"Nemohu naj-Bt zznam v '%-.64s'",-A
+"Nemohu naj-Bt zznam v '%-.64s'",
-"Nespr-Bvn informace v souboru '%-.64s'",-A
+"Nespr-Bvn informace v souboru '%-.64s'",
-"Nespr-Bvn kl pro tabulku '%-.64s'. Pokuste se ho opravit",-A
+"Nespr-Bvn kl pro tabulku '%-.64s'. Pokuste se ho opravit",
-"Star-B klov soubor pro '%-.64s'. Opravte ho.",-A
+"Star-B klov soubor pro '%-.64s'. Opravte ho.",
-"'%-.64s' je jen pro -Bten",-A
+"'%-.64s' je jen pro -Bten",
-"M-Blo pamti. Pestartujte daemona a zkuste znovu (je poteba %d byt)",-A
+"M-Blo pamti. Pestartujte daemona a zkuste znovu (je poteba %d byt)",
-"M-Blo pamti pro tdn. Zvyte velikost tdcho bufferu",-A
+"M-Blo pamti pro tdn. Zvyte velikost tdcho bufferu",
-"Neo-Bekvan konec souboru pi ten '%-.64s' (chybov kd: %d)",-A
+"Neo-Bekvan konec souboru pi ten '%-.64s' (chybov kd: %d)",
-"P-Bli mnoho spojen",-A
+"P-Bli mnoho spojen",
-"M-Blo prostoru/pamti pro thread",-A
+"M-Blo prostoru/pamti pro thread",
-"Nemohu zjistit jm-Bno stroje pro Vai adresu",-A
+"Nemohu zjistit jm-Bno stroje pro Vai adresu",
-"Chyba p-Bi ustavovn spojen",-A
+"Chyba p-Bi ustavovn spojen",
-"P-Bstup pro uivatele '%-.32s@%-.64s' k databzi '%-.64s' nen povolen",-A
+"P-Bstup pro uivatele '%-.32s@%-.64s' k databzi '%-.64s' nen povolen",
-"P-Bstup pro uivatele '%-.32s@%-.64s' (s heslem %s)",-A
+"P-Bstup pro uivatele '%-.32s@%-.64s' (s heslem %s)",
-"Nebyla vybr-Bna dn databze",-A
+"Nebyla vybr-Bna dn databze",
-"Nezn-Bm pkaz",-A
+"Nezn-Bm pkaz",
-"Sloupec '%-.64s' nem-Be bt null",-A
+"Sloupec '%-.64s' nem-Be bt null",
-"Nezn-Bm databze '%-.64s'",-A
+"Nezn-Bm databze '%-.64s'",
-"Tabulka '%-.64s' ji-B existuje",-A
+"Tabulka '%-.64s' ji-B existuje",
-"Nezn-Bm tabulka '%-.64s'",-A
+"Nezn-Bm tabulka '%-.64s'",
-"Sloupec '%-.64s' v %s nen-B zcela jasn",-A
+"Sloupec '%-.64s' v %s nen-B zcela jasn",
-"Prob-Bh ukonovn prce serveru",-A
+"Prob-Bh ukonovn prce serveru",
-"Nezn-Bm sloupec '%-.64s' v %s",-A
+"Nezn-Bm sloupec '%-.64s' v %s",
-"Pou-Bit '%-.64s' nebylo v group by",-A
+"Pou-Bit '%-.64s' nebylo v group by",
-"Nemohu pou-Bt group na '%-.64s'",-A
+"Nemohu pou-Bt group na '%-.64s'",
-"P-Bkaz obsahuje zrove funkci sum a sloupce",-A
+"P-Bkaz obsahuje zrove funkci sum a sloupce",
-"Po-Bet sloupc neodpovd zadan hodnot",-A
+"Po-Bet sloupc neodpovd zadan hodnot",
-"Jm-Bno identifiktoru '%-.64s' je pli dlouh",-A
+"Jm-Bno identifiktoru '%-.64s' je pli dlouh",
-"Zdvojen-B jmno sloupce '%-.64s'",-A
+"Zdvojen-B jmno sloupce '%-.64s'",
-"Zdvojen-B jmno kle '%-.64s'",-A
+"Zdvojen-B jmno kle '%-.64s'",
-"Zvojen-B kl '%-.64s' (slo kle %d)",-A
+"Zvojen-B kl '%-.64s' (slo kle %d)",
-"Chybn-B specifikace sloupce '%-.64s'",-A
+"Chybn-B specifikace sloupce '%-.64s'",
-"%s bl-Bzko '%-.64s' na dku %d",-A
+"%s bl-Bzko '%-.64s' na dku %d",
-"V-Bsledek dotazu je przdn",-A
+"V-Bsledek dotazu je przdn",
-"Nejednozna-Bn tabulka/alias: '%-.64s'",-A
+"Nejednozna-Bn tabulka/alias: '%-.64s'",
-"Chybn-B defaultn hodnota pro '%-.64s'",-A
+"Chybn-B defaultn hodnota pro '%-.64s'",
-"Definov-Bno vce primrnch kl",-A
+"Definov-Bno vce primrnch kl",
-"Zad-Bno pli mnoho kl, je povoleno nejvce %d kl",-A
+"Zad-Bno pli mnoho kl, je povoleno nejvce %d kl",
-"Zad-Bno pli mnoho st kl, je povoleno nejvce %d st",-A
+"Zad-Bno pli mnoho st kl, je povoleno nejvce %d st",
-"Zadan-B kl byl pli dlouh, nejvt dlka kle je %d",-A
+"Zadan-B kl byl pli dlouh, nejvt dlka kle je %d",
-"Kl-Bov sloupec '%-.64s' v tabulce neexistuje",-A
+"Kl-Bov sloupec '%-.64s' v tabulce neexistuje",
-"Blob sloupec '%-.64s' nem-Be bt pouit jako kl",-A
+"Blob sloupec '%-.64s' nem-Be bt pouit jako kl",
-"P-Bli velk dlka sloupce '%-.64s' (nejvce %d). Pouijte BLOB",-A
+"P-Bli velk dlka sloupce '%-.64s' (nejvce %d). Pouijte BLOB",
-"M-Bete mt pouze jedno AUTO pole a to mus bt definovno jako kl",-A
+"M-Bete mt pouze jedno AUTO pole a to mus bt definovno jako kl",
-"%s: p-Bipraven na spojen\n",-A
+"%s: p-Bipraven na spojen\n",
-"%s: norm-Bln ukonen\n",-A
+"%s: norm-Bln ukonen\n",
-"%s: p-Bijat signal %d, konm\n",-A
+"%s: p-Bijat signal %d, konm\n",
-"%s: ukon-Ben prce hotovo\n",-A
+"%s: ukon-Ben prce hotovo\n",
-"%s: n-Bsiln uzaven threadu %ld uivatele '%-.64s'\n",-A
+"%s: n-Bsiln uzaven threadu %ld uivatele '%-.64s'\n",
-"Nemohu vytvo-Bit IP socket",-A
+"Nemohu vytvo-Bit IP socket",
-"Tabulka '%-.64s' nem-B index odpovdajc CREATE INDEX. Vytvote tabulku znovu",-A
+"Tabulka '%-.64s' nem-B index odpovdajc CREATE INDEX. Vytvote tabulku znovu",
-"Argument separ-Btoru poloek nebyl oekvn. Pette si manul",-A
+"Argument separ-Btoru poloek nebyl oekvn. Pette si manul",
-"Nen-B mon pout pevn rowlength s BLOBem. Pouijte 'fields terminated by'.",-A
+"Nen-B mon pout pevn rowlength s BLOBem. Pouijte 'fields terminated by'.",
-"Soubor '%-.64s' mus-B bt v adresi databze nebo iteln pro vechny",-A
+"Soubor '%-.64s' mus-B bt v adresi databze nebo iteln pro vechny",
-"Soubor '%-.64s' ji-B existuje",-A
+"Soubor '%-.64s' ji-B existuje",
-"Z-Bznam: %ld  Vymazno: %ld  Peskoeno: %ld  Varovn: %ld",-A
+"Z-Bznam: %ld  Vymazno: %ld  Peskoeno: %ld  Varovn: %ld",
-"Z-Bznam: %ld  Zdvojench: %ld",-A
+"Z-Bznam: %ld  Zdvojench: %ld",
-"Chybn-B podst kle -- nen to etzec nebo je del ne dlka sti kle",-A
+"Chybn-B podst kle -- nen to etzec nebo je del ne dlka sti kle",
-"Nen-B mon vymazat vechny poloky s ALTER TABLE. Pouijte DROP TABLE",-A
+"Nen-B mon vymazat vechny poloky s ALTER TABLE. Pouijte DROP TABLE",
-"Nemohu zru-Bit '%-.64s' (provst DROP). Zkontrolujte, zda neexistuj zznamy/kle",-A
+"Nemohu zru-Bit '%-.64s' (provst DROP). Zkontrolujte, zda neexistuj zznamy/kle",
-"Z-Bznam: %ld  Zdvojench: %ld  Varovn: %ld",-A
+"Z-Bznam: %ld  Zdvojench: %ld  Varovn: %ld",
-"INSERT TABLE '%-.64s' nen-B dovoleno v seznamu tabulek FROM",-A
+"INSERT TABLE '%-.64s' nen-B dovoleno v seznamu tabulek FROM",
-"Nezn-Bm identifikace threadu: %lu",-A
+"Nezn-Bm identifikace threadu: %lu",
-"Nejste vlastn-Bkem threadu %lu",-A
+"Nejste vlastn-Bkem threadu %lu",
-"Nejsou pou-Bity dn tabulky",-A
+"Nejsou pou-Bity dn tabulky",
-"P-Bli mnoho etzc pro sloupec %s a SET",-A
+"P-Bli mnoho etzc pro sloupec %s a SET",
-"Nemohu vytvo-Bit jednoznan jmno logovacho souboru %s.(1-999)\n",-A
+"Nemohu vytvo-Bit jednoznan jmno logovacho souboru %s.(1-999)\n",
-"Tabulka '%-.64s' byla zam-Bena s READ a neme bt zmnna",-A
+"Tabulka '%-.64s' byla zam-Bena s READ a neme bt zmnna",
-"Tabulka '%-.64s' nebyla zam-Bena s LOCK TABLES",-A
+"Tabulka '%-.64s' nebyla zam-Bena s LOCK TABLES",
-"Blob polo-Bka '%-.64s' neme mt defaultn hodnotu",-A
+"Blob polo-Bka '%-.64s' neme mt defaultn hodnotu",
-"Nep-Bpustn jmno databze '%-.64s'",-A
+"Nep-Bpustn jmno databze '%-.64s'",
-"Nep-Bpustn jmno tabulky '%-.64s'",-A
+"Nep-Bpustn jmno tabulky '%-.64s'",
-"Zadan-B SELECT by prochzel pli mnoho zznam a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v podku, pouijte SET OPTION SQL_BIG_SELECTS=1",-A
+"Zadan-B SELECT by prochzel pli mnoho zznam a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v podku, pouijte SET OPTION SQL_BIG_SELECTS=1",
-"Nezn-Bm chyba",-A
+"Nezn-Bm chyba",
-"Nezn-Bm procedura %s",-A
+"Nezn-Bm procedura %s",
-"Chybn-B poet parametr procedury %s",-A
+"Chybn-B poet parametr procedury %s",
-"Chybn-B parametry procedury %s",-A
+"Chybn-B parametry procedury %s",
-"Nezn-Bm tabulka '%-.64s' v %s",-A
+"Nezn-Bm tabulka '%-.64s' v %s",
-"Polo-Bka '%-.64s' je zadna dvakrt",-A
+"Polo-Bka '%-.64s' je zadna dvakrt",
-"Nespr-Bvn pouit funkce group",-A
+"Nespr-Bvn pouit funkce group",
-"Tabulka '%-.64s' pou-Bv rozen, kter v tto verzi MySQL nen",-A
+"Tabulka '%-.64s' pou-Bv rozen, kter v tto verzi MySQL nen",
-"Tabulka mus-B mt alespo jeden sloupec",-A
+"Tabulka mus-B mt alespo jeden sloupec",
-"Tabulka '%-.64s' je pln-B",-A
+"Tabulka '%-.64s' je pln-B",
-"Nezn-Bm znakov sada: '%-.64s'",-A
+"Nezn-Bm znakov sada: '%-.64s'",
-"P-Bli mnoho tabulek, MySQL jich me mt v joinu jen %d",-A
+"P-Bli mnoho tabulek, MySQL jich me mt v joinu jen %d",
-"P-Bli mnoho poloek",-A
+"P-Bli mnoho poloek",
-"-Bdek je pli velk. Maximln velikost dku, nepotaje poloky blob, je %d. Muste zmnit nkter poloky na blob",-A
+"-Bdek je pli velk. Maximln velikost dku, nepotaje poloky blob, je %d. Muste zmnit nkter poloky na blob",
-"P-Beteen zsobnku threadu: pouito %ld z %ld. Pouijte 'mysqld -O thread_stack=#' k zadn vtho zsobnku",-A
+"P-Beteen zsobnku threadu: pouito %ld z %ld. Pouijte 'mysqld -O thread_stack=#' k zadn vtho zsobnku",
-"V OUTER JOIN byl nalezen k-Bov odkaz. Provte ON podmnky",-A
+"V OUTER JOIN byl nalezen k-Bov odkaz. Provte ON podmnky",
-"Sloupec '%-.32s' je pou-Bit s UNIQUE nebo INDEX, ale nen definovn jako NOT NULL",-A
+"Sloupec '%-.32s' je pou-Bit s UNIQUE nebo INDEX, ale nen definovn jako NOT NULL",
-"Nemohu na-Bst funkci '%-.64s'",-A
+"Nemohu na-Bst funkci '%-.64s'",
 "Nemohu inicializovat funkci '%-.64s'; %-.80s",
-"Pro sd-Blenou knihovnu nejsou povoleny cesty",-A
+"Pro sd-Blenou knihovnu nejsou povoleny cesty",
-"Funkce '%-.64s' ji-B existuje",-A
+"Funkce '%-.64s' ji-B existuje",
-"Nemohu otev-Bt sdlenou knihovnu '%-.64s' (errno: %d %s)",-A
+"Nemohu otev-Bt sdlenou knihovnu '%-.64s' (errno: %d %s)",
-"Nemohu naj-Bt funkci '%-.64s' v knihovn'",-A
+"Nemohu naj-Bt funkci '%-.64s' v knihovn'",
-"Funkce '%-.64s' nen-B definovna",-A
+"Funkce '%-.64s' nen-B definovna",
-"Stroj '%-.64s' je zablokov-Bn kvli mnoha chybm pi pipojovn. Odblokujete pouitm 'mysqladmin flush-hosts'",-A
+"Stroj '%-.64s' je zablokov-Bn kvli mnoha chybm pi pipojovn. Odblokujete pouitm 'mysqladmin flush-hosts'",
-"Stroj '%-.64s' nem-B povoleno se k tomuto MySQL serveru pipojit",-A
+"Stroj '%-.64s' nem-B povoleno se k tomuto MySQL serveru pipojit",
-"Pou-Bvte MySQL jako anonymn uivatel a anonymn uivatel nemaj povoleno mnit hesla",-A
+"Pou-Bvte MySQL jako anonymn uivatel a anonymn uivatel nemaj povoleno mnit hesla",
-"Na zm-Bnu hesel ostatnm muste mt prvo provst update tabulek v databzi mysql",-A
+"Na zm-Bnu hesel ostatnm muste mt prvo provst update tabulek v databzi mysql",
-"V tabulce user nen-B dn odpovdajc dek",-A
+"V tabulce user nen-B dn odpovdajc dek",
-"Nalezen-Bch dk: %ld  Zmnno: %ld  Varovn: %ld",-A
+"Nalezen-Bch dk: %ld  Zmnno: %ld  Varovn: %ld",
-"Nemohu vytvo-Bit nov thread (errno %d). Pokud je jet njak voln pam, podvejte se do manulu na st o chybch specifickch pro jednotliv operan systmy",-A
+"Nemohu vytvo-Bit nov thread (errno %d). Pokud je jet njak voln pam, podvejte se do manulu na st o chybch specifickch pro jednotliv operan systmy",
-"Po-Bet sloupc neodpovd potu hodnot na dku %ld",-A
+"Po-Bet sloupc neodpovd potu hodnot na dku %ld",
-"Nemohu znovuotev-Bt tabulku: '%-.64s',-A
+"Nemohu znovuotev-Bt tabulku: '%-.64s",
-"Neplatn-B uit hodnoty NULL",-A
+"Neplatn-B uit hodnoty NULL",
-"Regul-Brn vraz vrtil chybu '%-.64s'",-A
+"Regul-Brn vraz vrtil chybu '%-.64s'",
-"Pokud nen-B dn GROUP BY klauzule, nen dovoleno souasn pouit GROUP poloek (MIN(),MAX(),COUNT()...) s ne GROUP polokami",-A
+"Pokud nen-B dn GROUP BY klauzule, nen dovoleno souasn pouit GROUP poloek (MIN(),MAX(),COUNT()...) s ne GROUP polokami",
-"Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s'",-A
+"Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s'",
-"%-.16s p-Bkaz nepstupn pro uivatele: '%-.32s@%-.64s' pro tabulku '%-.64s'",-A
+"%-.16s p-Bkaz nepstupn pro uivatele: '%-.32s@%-.64s' pro tabulku '%-.64s'",
-"%-.16s p-Bkaz nepstupn pro uivatele: '%-.32s@%-.64s' pro sloupec '%-.64s' v tabulce '%-.64s'",-A
+"%-.16s p-Bkaz nepstupn pro uivatele: '%-.32s@%-.64s' pro sloupec '%-.64s' v tabulce '%-.64s'",
-"Neplatn-B pkaz GRANT/REVOKE. Prosm, pette si v manulu, jak privilegia je mon pout.",-A
+"Neplatn-B pkaz GRANT/REVOKE. Prosm, pette si v manulu, jak privilegia je mon pout.",
-"Argument p-Bkazu GRANT uivatel nebo stroj je pli dlouh",-A
+"Argument p-Bkazu GRANT uivatel nebo stroj je pli dlouh",
 "Tabulka '%-64s.%s' neexistuje",
-"Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s' pro tabulku '%-.64s'",-A
+"Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s' pro tabulku '%-.64s'",
-"Pou-Bit pkaz nen v tto verzi MySQL povolen",-A
+"Pou-Bit pkaz nen v tto verzi MySQL povolen",
-"Va-Be syntaxe je njak divn",-A
+"Va-Be syntaxe je njak divn",
-"Zpo-Bdn insert threadu nebyl schopen zskat poadovan zmek pro tabulku %-.64s",-A
+"Zpo-Bdn insert threadu nebyl schopen zskat poadovan zmek pro tabulku %-.64s",
-"P-Bli mnoho zpodnch thread",-A
+"P-Bli mnoho zpodnch thread",
-"Zru-Beno spojen %ld do databze: '%-.64s' uivatel: '%-.64s' (%s)",-A
+"Zru-Beno spojen %ld do databze: '%-.64s' uivatel: '%-.64s' (%s)",
-"Zji-Btn pchoz packet del ne 'max_allowed_packet'",-A
+"Zji-Btn pchoz packet del ne 'max_allowed_packet'",
-"Zji-Btna chyba pi ten z roury spojen",-A
+"Zji-Btna chyba pi ten z roury spojen",
-"Zji-Btna chyba fcntl()",-A
+"Zji-Btna chyba fcntl()",
-"P-Bchoz packety v chybnm poad",-A
+"P-Bchoz packety v chybnm poad",
-"Nemohu rozkomprimovat komunika-Bn packet",-A
+"Nemohu rozkomprimovat komunika-Bn packet",
-"Zji-Btna chyba pi ten komunikanho packetu",-A
+"Zji-Btna chyba pi ten komunikanho packetu",
-"Zji-Btn timeout pi ten komunikanho packetu",-A
+"Zji-Btn timeout pi ten komunikanho packetu",
-"Zji-Btna chyba pi zpisu komunikanho packetu",-A
+"Zji-Btna chyba pi zpisu komunikanho packetu",
-"Zji-Btn timeout pi zpisu komunikanho packetu",-A
+"Zji-Btn timeout pi zpisu komunikanho packetu",
-"V-Bsledn etzec je del ne max_allowed_packet",-A
+"V-Bsledn etzec je del ne max_allowed_packet",
-"Typ pou-Bit tabulky nepodporuje BLOB/TEXT sloupce",-A
+"Typ pou-Bit tabulky nepodporuje BLOB/TEXT sloupce",
-"Typ pou-Bit tabulky nepodporuje AUTO_INCREMENT sloupce",-A
+"Typ pou-Bit tabulky nepodporuje AUTO_INCREMENT sloupce",
-"INSERT DELAYED nen-B mono s tabulkou '%-.64s' pout, protoe je zamen pomoc LOCK TABLES",-A
+"INSERT DELAYED nen-B mono s tabulkou '%-.64s' pout, protoe je zamen pomoc LOCK TABLES",
-"Nespr-Bvn jmno sloupce '%-.100s'",-A
+"Nespr-Bvn jmno sloupce '%-.100s'",
-"Handler pou-Bit tabulky neum indexovat sloupce '%-.64s'",-A
+"Handler pou-Bit tabulky neum indexovat sloupce '%-.64s'",
-"V-Bechny tabulky v MERGE tabulce nejsou definovny stejn",-A
+"V-Bechny tabulky v MERGE tabulce nejsou definovny stejn",
-"Kv-Bli unique constraintu nemozu zapsat do tabulky '%-.64s'",-A
+"Kv-Bli unique constraintu nemozu zapsat do tabulky '%-.64s'",
-"BLOB sloupec '%-.64s' je pou-Bit ve specifikaci kle bez dlky",-A
+"BLOB sloupec '%-.64s' je pou-Bit ve specifikaci kle bez dlky",
-"V-Bechny sti primrnho kle musej bt NOT NULL; pokud potebujete NULL, pouijte UNIQUE",-A
+"V-Bechny sti primrnho kle musej bt NOT NULL; pokud potebujete NULL, pouijte UNIQUE",
-"V-Bsledek obsahuje vce ne jeden dek",-A
+"V-Bsledek obsahuje vce ne jeden dek",
-"Tento typ tabulky vy-Baduje primrn kl",-A
+"Tento typ tabulky vy-Baduje primrn kl",
-"Tato verze MySQL nen-B zkompilovna s podporou RAID",-A
+"Tato verze MySQL nen-B zkompilovna s podporou RAID",
-"Update tabulky bez WHERE s kl-Bem nen v mdu bezpench update dovoleno",-A
+"Update tabulky bez WHERE s kl-Bem nen v mdu bezpench update dovoleno",
-"Kl-B '%-.64s' v tabulce '%-.64s' neexistuje",-A
+"Kl-B '%-.64s' v tabulce '%-.64s' neexistuje",
-"Nemohu otev-Bt tabulku",-A
+"Nemohu otev-Bt tabulku",
 "Handler tabulky nepodporuje check/repair",
-"Proveden-B tohoto pkazu nen v transakci dovoleno",-A
+"Proveden-B tohoto pkazu nen v transakci dovoleno",
-"Chyba %d p-Bi COMMIT",-A
+"Chyba %d p-Bi COMMIT",
-"Chyba %d p-Bi ROLLBACK",-A
+"Chyba %d p-Bi ROLLBACK",
-"Chyba %d p-Bi FLUSH_LOGS",-A
+"Chyba %d p-Bi FLUSH_LOGS",
-"Chyba %d p-Bi CHECKPOINT",-A
+"Chyba %d p-Bi CHECKPOINT",
-"Spojen-B %ld do databze: '%-.64s' uivatel: '%-.32s' stroj: `%-.64s' (%-.64s) bylo perueno",-A
+"Spojen-B %ld do databze: '%-.64s' uivatel: '%-.32s' stroj: `%-.64s' (%-.64s) bylo perueno",
-"Handler tabulky nepodporuje bin-Brn dump",-A
+"Handler tabulky nepodporuje bin-Brn dump",
-"Binlog uzav-Ben pi pokusu o FLUSH MASTER",-A
+"Binlog uzav-Ben pi pokusu o FLUSH MASTER",
-"P-Bebudovn indexu dumpnut tabulky '%-.64s' nebylo spn",-A
+"P-Bebudovn indexu dumpnut tabulky '%-.64s' nebylo spn",
 "Chyba masteru: '%-.64s'",
-"S-Bov chyba pi ten z masteru",-A
+"S-Bov chyba pi ten z masteru",
-"S-Bov chyba pi zpisu na master",-A
+"S-Bov chyba pi zpisu na master",
-"-Bdn sloupec nem vytvoen fulltextov index",-A
+"-Bdn sloupec nem vytvoen fulltextov index",
-"Nemohu prov-Bst zadan pkaz, protoe existuj aktivn zamen tabulky nebo aktivn transakce",-A
+"Nemohu prov-Bst zadan pkaz, protoe existuj aktivn zamen tabulky nebo aktivn transakce",
-"Nezn-Bm systmov promnn '%-.64s'",-A
+"Nezn-Bm systmov promnn '%-.64s'",
-"Tabulka '%-.64s' je ozna-Bena jako poruen a mla by bt opravena",-A
+"Tabulka '%-.64s' je ozna-Bena jako poruen a mla by bt opravena",
-"Tabulka '%-.64s' je ozna-Bena jako poruen a posledn (automatick?) oprava se nezdaila",-A
+"Tabulka '%-.64s' je ozna-Bena jako poruen a posledn (automatick?) oprava se nezdaila",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -108,7 +108,7 @@
 "BLOB feltet '%-.64s' kan ikke have en standard værdi",
 "Ugyldigt database navn '%-.64s'",
 "Ugyldigt tabel navn '%-.64s'",
-"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt"
+"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt",
 "Ukendt fejl",
 "Ukendt procedure %s",
 "Forkert antal  parametre til proceduren %s",
@@ -141,7 +141,7 @@
 "Poster fundet: %ld  Ændret: %ld  Advarsler: %ld",
 "Kan ikke danne en ny tråd (fejl nr. %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl",
 "Kolonne antallet stemmer ikke overens med antallet af værdier i post %ld",
-"Kan ikke genåbne tabel '%-.64s',
+"Kan ikke genåbne tabel '%-.64s",
 "Forkert brug af nulværdi (NULL)",
 "Fik fejl '%-.64s' fra regexp",
 "Sammenblanding af GROUP kolonner (MIN(),MAX(),COUNT()...) uden GROUP kolonner er ikke tilladt, hvis der ikke er noget GROUP BY prædikat",
@@ -162,7 +162,7 @@
 "Fik fejlmeddelelse fra fcntl()",
 "Modtog ikke datapakker i korrekt rækkefølge",
 "Kunne ikke dekomprimere kommunikations-pakke (communication packet)",
-"Fik fejlmeddelelse ved læsning af kommunikations-pakker (communication packets)"
+"Fik fejlmeddelelse ved læsning af kommunikations-pakker (communication packets)",
 "Timeout-fejl ved læsning af kommunukations-pakker (communication packets)",
 "Fik fejlmeddelelse ved skrivning af kommunukations-pakker (communication packets)",
 "Timeout-fejl ved skrivning af kommunukations-pakker (communication packets)",
@@ -201,7 +201,7 @@
 "Tabellen '%-.64s' er markeret med fejl og bør repareres",
 "Tabellen '%-.64s' er markeret med fejl og sidste (automatiske?) REPAIR fejlede",
 "Advarsel: Visse data i tabeller der ikke understøtter transaktioner kunne ikke tilbagestilles",
-"Fler-udtryks transaktion krævede mere plads en 'max_binlog_cache_size' bytes. Forhøj værdien af denne variabel og prøv igen',
+"Fler-udtryks transaktion krævede mere plads en 'max_binlog_cache_size' bytes. Forhøj værdien af denne variabel og prøv igen",
 "Denne handling kunne ikke udføres med kørende slave, brug først kommandoen SLAVE STOP",
 "Denne handling kræver en kørende slave. Konfigurer en slave og brug kommandoen SLAVE START",
 "Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO",

--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -144,7 +144,7 @@
 "Passende rijen: %ld  Gewijzigd: %ld  Waarschuwingen: %ld",
 "Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout",
 "Kolom aantal komt niet overeen met waarde aantal in rij %ld",
-"Kan tabel niet opnieuw openen: '%-.64s',
+"Kan tabel niet opnieuw openen: '%-.64s",
 "Foutief gebruik van de NULL waarde",
 "Fout '%-.64s' ontvangen van regexp",
 "Het mixen van GROUP kolommen (MIN(),MAX(),COUNT()...) met no-GROUP kolommen is foutief indien er geen GROUP BY clausule is",
@@ -165,7 +165,7 @@
 "Kreeg fout van fcntl()",
 "Pakketten in verkeerde volgorde ontvangen",
 "Communicatiepakket kon niet worden gedecomprimeerd",
-"Fout bij het lezen van communicatiepakketten"
+"Fout bij het lezen van communicatiepakketten",
 "Timeout bij het lezen van communicatiepakketten",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -204,7 +204,7 @@
 "Tabel '%-.64s' staat als gecrashed gemarkeerd en dient te worden gerepareerd",
 "Tabel '%-.64s' staat als gecrashed gemarkeerd en de laatste (automatische?) reparatie poging mislukte",
 "Waarschuwing: Roll back mislukt voor sommige buiten transacties gewijzigde tabellen",
-"Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw',
+"Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw",
 "Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst SLAVE STOP",
 "Deze operatie vereist een actieve slave, configureer slave en doe dan SLAVE START",
 "De server is niet geconfigureerd als slave, fix in configuratie bestand of met CHANGE MASTER TO",

--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -166,7 +166,7 @@
 "Result string is longer than max_allowed_packet",
 "The used table type doesn't support BLOB/TEXT columns",
 "The used table type doesn't support AUTO_INCREMENT columns",
-"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES",
+"INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES",
 "Incorrect column name '%-.100s'",
 "The used table handler can't index column '%-.64s'",
 "All tables in the MERGE table are not identically defined",
@@ -198,7 +198,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -142,7 +142,7 @@
 "Sobinud kirjed: %ld  Muudetud: %ld  Hoiatusi: %ld",
 "Ei saa luua threadi (vea kood %d). Kui mlu pole otsas, tasub operatsioonissteemi spetsiifilist viga",
 "Tulpade arv ei vasta vrtuste hulgale reas %ld",
-"Ei saa avada tabelit: '%-.64s',
+"Ei saa avada tabelit: '%-.64s",
 "NULL vrtuse vrkasutus",
 "Viga '%-.64s' regexp-i kest",
 "GROUP tulpade segamine (MIN(),MAX(),COUNT()...) on vr kui ei kasutata GROUP BY klauslit",
@@ -202,7 +202,7 @@
 "Tabel '%-.64s' on mrgitud vigaseks ja tuleb parandada",
 "Tabel '%-.64s' on mrgitud vigaseks ja viimane (automaatne?) parandamiskatse ebannestus",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -122,7 +122,7 @@
 "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB",
 "Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld.  Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur",
 "Dépendance croisée dans une clause OUTER JOIN. Vérifiez la condition ON",
-"La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas définie comme NOT NULL"
+"La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas définie comme NOT NULL",
 "Imposible de charger la fonction '%-.64s'",
 "Impossible d'initialiser la fonction '%-.64s'; %-.80s",
 "Chemin interdit pour les bibliothèques partagées",
@@ -138,7 +138,7 @@
 "Enregistrements correspondants: %ld  Modifiés: %ld  Warnings: %ld",
 "Impossible de créer une nouvelle tâche (errno %d). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS",
 "Column count doesn't match value count at row %ld",
-"Impossible de réouvrir la table: '%-.64s',
+"Impossible de réouvrir la table: '%-.64s",
 "Utilisation incorrecte de la valeur NULL",
 "Erreur '%-.64s' provenant de regexp",
 "Mélanger les colonnes GROUP (MIN(),MAX(),COUNT()...) avec des colonnes normales est interdit s'il n'y a pas de clause GROUP BY",
@@ -159,7 +159,7 @@
 "Erreur reçue de fcntl() ",
 "Paquets reçus dans le désordre",
 "Impossible de décompresser le paquet reçu",
-"Erreur de lecture des paquets reçus"
+"Erreur de lecture des paquets reçus",
 "Timeout en lecture des paquets reçus",
 "Erreur d'écriture des paquets envoyés",
 "Timeout d'écriture des paquets envoyés",
@@ -198,7 +198,7 @@
 "La table '%-.64s' est marquée 'crashed' et devrait être réparée",
 "La table '%-.64s' est marquée 'crashed' et le dernier 'repair' a échoué",
 "Attention: certaines tables ne supportant pas les transactions ont été changées et elles ne pourront pas être restituées",
-"Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez',
+"Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez",
 "Cette opération ne peut être réalisée avec un esclave actif, faites SLAVE STOP d'abord",
 "Cette opération nécessite un esclave actif, configurez les esclaves et faites SLAVE START",
 "Le server n'est pas configuré comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO",

--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -39,7 +39,7 @@
 "Kann Datensatz nicht finden.",
 "Falsche Information in Datei: '%-.64s'",
 "Falsche Schlüssel-Datei für Tabelle '%-.64s'. Versuche zu reparieren!",
-"Alte Schlüssel-Datei für Tabelle '%-.64s'. Repariere!
+"Alte Schlüssel-Datei für Tabelle '%-.64s'. Repariere!",
 "'%-.64s' ist nur lesbar.",
 "Kein Speicher (benötigt %d bytes). Server neu starten.",
 "Kein Speicher zum Sortieren. Server Sortier-Buffer erhöhen.",
@@ -162,7 +162,7 @@
 "Fehler von fcntl()",
 "Empfangenes Paket ist nicht in Reihenfolge",
 "Communikation-Packet läßt sich nicht entpacken",
-"Fehler beim Lesen eines Communication-Packets"
+"Fehler beim Lesen eines Communication-Packets",
 "Timeout beim Lesen eines Communication-Packets",
 "Fehler beim Schreiben eines Communication-Packets",
 "Timeout beim Schreiben eines Communication-Packets",
@@ -201,7 +201,7 @@
 "Tabelle '%-.64s' ist als defekt makiert und sollte repariert werden",
 "Tabelle '%-.64s' ist als defekt makiert und der letzte (automatische) Reparaturversuch schlug fehl.",
 "Warnung:  Das Rollback konnte bei einigen Tabellen, die nicht mittels Transaktionen geändert wurden, nicht ausgeführt werden.",
-"Multi-Statement Transaktionen benötigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variabel vergrössern und nochmal versuchen.',
+"Multi-Statement Transaktionen benötigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variabel vergrössern und nochmal versuchen.",
 "Diese Operation kann nicht bei einem aktiven Slave durchgeführt werden. Das Kommand SLAVE STOP muss zuerst ausgeführt werden.",
 "Diese Operationbenötigt einen aktiven Slave. Slave konfigurieren und mittels SLAVE START aktivieren.",
 "Der Server ist nicht als Slave konfigiriert. Im Konfigurations-File oder mittel CHANGE MASTER TO beheben.",

--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -159,7 +159,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -198,7 +198,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -140,7 +140,7 @@
 "Megegyezo sorok szama: %ld  Valtozott: %ld  Warnings: %ld",
 "Uj thread letrehozasa nem lehetseges (Hibakod: %d). Amenyiben van meg szabad memoria, olvassa el a kezikonyv operacios rendszerfuggo hibalehetosegekrol szolo reszet",
 "Az oszlopban talalhato ertek nem egyezik meg a %ld sorban szamitott ertekkel",
-"Nem lehet ujra-megnyitni a tablat: '%-.64s',
+"Nem lehet ujra-megnyitni a tablat: '%-.64s",
 "A NULL ervenytelen hasznalata",
 "'%-.64s' hiba a regularis kifejezes hasznalata soran (regexp)",
 "A GROUP mezok (MIN(),MAX(),COUNT()...) kevert hasznalata nem lehetseges GROUP BY hivatkozas nelkul",
@@ -161,7 +161,7 @@
 "Hiba a fcntl() fuggvenyben",
 "Helytelen sorrendben erkezett adatcsomagok",
 "A kommunikacios adatcsomagok nem tomorithetok ki",
-"HIba a kommunikacios adatcsomagok olvasasa soran"
+"HIba a kommunikacios adatcsomagok olvasasa soran",
 "Idotullepes a kommunikacios adatcsomagok olvasasa soran",
 "Hiba a kommunikacios csomagok irasa soran",
 "Idotullepes a kommunikacios csomagok irasa soran",
@@ -200,7 +200,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -29,7 +29,7 @@
 "Errore durante la rinominazione da '%-.64s' a '%-.64s' (errno: %d)",
 "Errore durante la scrittura del file '%-.64s' (errno: %d)",
 "'%-.64s' e` soggetto a lock contro i cambiamenti",
-"Operazione di ordinamento abbandonata" ,
+"Operazione di ordinamento abbandonata",
 "La view '%-.64s' non esiste per '%-.64s'",
 "Rilevato l'errore %d dal gestore delle tabelle",
 "Il gestore delle tabelle per '%-.64s' non ha questa opzione",
@@ -84,7 +84,7 @@
 "%s: Forzata la chiusura del thread %ld utente: '%-.64s'\n",
 "Impossibile creare il socket IP",
 "La tabella '%-.64s' non ha nessun indice come quello specificatato dalla CREATE INDEX. Ricrea la tabella",
-"L'argomento 'Field separator' non e` quello atteso. Controlla il manuale","
+"L'argomento 'Field separator' non e` quello atteso. Controlla il manuale",
 "Non possono essere usate righe a lunghezza fissa con i BLOB. Usa 'FIELDS TERMINATED BY'.",
 "Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti",
 "Il file '%-.64s' esiste gia`",
@@ -198,7 +198,7 @@
 "La tabella '%-.64s' e` segnalata come corrotta e deve essere riparata",
 "La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita",
 "Attenzione: Alcune delle modifiche alle tabelle non transazionali non possono essere ripristinate (roll back impossibile)",
-"La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare',
+"La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare",
 "Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP",
 "Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START",
 "Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO",

--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -161,7 +161,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -200,7 +200,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -138,7 +138,7 @@
 "일치하는 Rows : %ld개 변경됨: %ld개  경고: %ld개",
 "새로운 쓰레드를 만들 수 없습니다.(에러번호 %d). 만약 여유메모리가 있다면 OS-dependent버그 의 메뉴얼 부분을 찾아보시오.",
 "Row %ld에서 칼럼 카운트와 value 카운터와 일치하지 않습니다.",
-"테이블을 다시 열수 없군요: '%-.64s',
+"테이블을 다시 열수 없군요: '%-.64s",
 "NULL 값을 잘못 사용하셨군요...",
 "regexp에서 '%-.64s'가 났습니다.",
 "Mixing of GROUP 칼럼s (MIN(),MAX(),COUNT()...) with no GROUP 칼럼s is illegal if there is no GROUP BY clause",
@@ -159,7 +159,7 @@
 "fcntl() 함수로부터 에러가 발생하였습니다.",
 "순서가 맞지않는 패킷을 받았습니다.",
 "통신 패킷의 압축해제를 할 수 없었습니다.",
-"통신 패킷을 읽는 중 오류가 발생하였습니다."
+"통신 패킷을 읽는 중 오류가 발생하였습니다.",
 "통신 패킷을 읽는 중 timeout이 발생하였습니다.",
 "통신 패킷을 기록하는 중 오류가 발생하였습니다.",
 "통신 패팃을 기록하는 중 timeout이 발생하였습니다.",
@@ -198,7 +198,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -107,7 +107,7 @@
 "Blob feltet '%-.64s' kan ikkje ha ein standard verdi",
 "Ugyldig database namn '%-.64s'",
 "Ugyldig tabell namn '%-.64s'",
-"SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt"
+"SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
 "Ukjend feil",
 "Ukjend prosedyre %s",
 "Feil parameter tal til prosedyra %s",
@@ -140,7 +140,7 @@
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
 "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
 "Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s',
+"Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
 "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
@@ -161,7 +161,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -200,7 +200,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -107,7 +107,7 @@
 "Blob feltet '%-.64s' kan ikke ha en standard verdi",
 "Ugyldig database navn '%-.64s'",
 "Ugyldig tabell navn '%-.64s'",
-"SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt"
+"SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
 "Ukjent feil",
 "Ukjent prosedyre %s",
 "Feil parameter antall til prosedyren %s",
@@ -140,7 +140,7 @@
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
 "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
 "Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s',
+"Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
 "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
@@ -161,7 +161,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -200,7 +200,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -85,10 +85,10 @@
 "%s: Standardowe zakoczenie dziaania\n",
 "%s: Otrzymano sygna %d. Koczenie dziaania!\n",
 "%s: Zakoczenie dziaania wykonane\n",
-"%s: Wymuszenie zamknicia w?tku %ld  uytkownik: '%-.64s'\n",  
+"%s: Wymuszenie zamknicia w?tku %ld  uytkownik: '%-.64s'\n",
 "Nie mona stworzy socket'u IP",
 "Tabela '%-.64s' nie ma indeksu takiego jak w CREATE INDEX. Stwrz tabel",
-"Nie oczekiwano separatora. Sprawd podrcznik","
+"Nie oczekiwano separatora. Sprawd podrcznik",
 "Nie mona uy staej dugo?ci wiersza z polami typu BLOB. Uyj 'fields terminated by'.",
 "Plik '%-.64s' musi znajdowa sie w katalogu bazy danych lub mie prawa czytania przez wszystkich",
 "Plik '%-.64s' ju istnieje",
@@ -142,7 +142,7 @@
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
 "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
 "Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s',
+"Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
 "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
@@ -163,7 +163,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -202,7 +202,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -138,7 +138,7 @@
 "Linhas que combinaram: %ld - Alteradas: %ld - Avisos: %ld",
 "Não pode criar uma nova 'thread' (erro no. %d). Se você não estiver sem memória disponível, você pode consultar o manual sobre um possível 'bug' dependente do sistema operacional",
 "Contagem de colunas não confere com a contagem de valores na linha %ld",
-"Não pode reabrir a tabela '%-.64s',
+"Não pode reabrir a tabela '%-.64s",
 "Uso inválido do valor NULL",
 "Obteve erro '%-.64s' em regexp",
 "Mistura de colunas agrupadas (com MIN(), MAX(), COUNT(), ...) com colunas não agrupadas é ilegal, se não existir uma cláusula de agrupamento (cláusula GROUP BY)",

--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -202,7 +202,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -62,7 +62,7 @@
 " '%-.64s'    GROUP BY",
 "     '%-.64s'",
 "      ,   ",
-"     "
+"     ",
 "  : '%-.64s'",
 "   '%-.64s'",
 "   '%-.64s'",
@@ -141,7 +141,7 @@
 " : %ld  : %ld  : %ld",
 "     ( %d).    -  ,     OS- ",
 "        %ld",
-"    : '%-.64s',
+"    : '%-.64s",
 "   NULL",
 "REGEXP   '%-.64s'",
 "   (MIN(),MAX(),COUNT()...)          GROUP BY",
@@ -162,7 +162,7 @@
 "fcntl()  ",
 "    ",
 "   ",
-"   "
+"   ",
 "   ",
 "   ",
 "   ",

--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -146,7 +146,7 @@
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
 "Can't create a new thread (errno %d). If you are not out of available memory, you can consult the manual for a possible OS-dependent bug",
 "Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s',
+"Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
 "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
@@ -167,7 +167,7 @@
 "Got an error from fcntl()",
 "Got packets out of order",
 "Couldn't uncompress communication packet",
-"Got an error reading communication packets"
+"Got an error reading communication packets",
 "Got timeout reading communication packets",
 "Got an error writing communication packets",
 "Got timeout writing communication packets",
@@ -206,7 +206,7 @@
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",

--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -139,7 +139,7 @@
 "Líneas correspondientes: %ld  Cambiadas: %ld  Avisos: %ld",
 "No puedo crear un nuevo thread (errno %d). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO",
 "El número de columnas no corresponde al número en la línea %ld",
-"No puedo reabrir tabla: '%-.64s',
+"No puedo reabrir tabla: '%-.64s",
 "Invalido uso de valor NULL",
 "Obtenido error '%-.64s' de regexp",
 "Mezcla de columnas GROUP (MIN(),MAX(),COUNT()...) con no GROUP columnas es ilegal si no hat la clausula GROUP BY",
@@ -160,7 +160,7 @@
 "Obtenido un error de fcntl()",
 "Obtenido paquetes desordenados",
 "No puedo descomprimir paquetes de comunicación",
-"Obtenido un error leyendo paquetes de comunicación"
+"Obtenido un error leyendo paquetes de comunicación",
 "Obtenido timeout leyendo paquetes de comunicación",
 "Obtenido un error de escribiendo paquetes de comunicación",
 "Obtenido timeout escribiendo paquetes de comunicación",
@@ -199,7 +199,7 @@
 "Tabla '%-.64s' está marcada como crashed y debe ser reparada",
 "Tabla '%-.64s' está marcada como crashed y la última reparación (automactica?) falló",
 "Aviso:  Algunas tablas no transancionales no pueden tener rolled back",
-"Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo',
+"Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo",
 "Esta operación no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP",
 "Esta operación necesita el esclavo funcionando, configure esclavo y haga el SLAVE START",
 "El servidor no está configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO",

--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -85,7 +85,7 @@
 "Kan inte skapa IP socket",
 "Tabellen '%-.64s' har inget index som motsvarar det angivna i CREATE INDEX. Skapa om tabellen",
 "Fält separatorerna är inte emotsägande eller för långa. Kontrollera mot manualen",
-"Man kan inte använda fast radlängd med blobs. Använd 'fields terminated by'."
+"Man kan inte använda fast radlängd med blobs. Använd 'fields terminated by'",
 "Textfilen '%' måste finnas i databas biblioteket eller vara läsbar för alla",
 "Filen '%-.64s' existerar redan",
 "Rader: %ld  Bortagna: %ld  Dubletter: %ld  Varningar: %ld",
@@ -102,7 +102,7 @@
 "Kan inte generera ett unikt filnamn %s.(1-999)\n",
 "Tabell '%-.64s' kan inte uppdateras emedan den är låst för läsning",
 "Tabell '%-.64s' är inte låst med LOCK TABLES",
-"BLOB fält '%-.64s' kan inte ha ett DEFAULT värde"
+"BLOB fält '%-.64s' kan inte ha ett DEFAULT värde",
 "Felaktigt databas namn '%-.64s'",
 "Felaktigt tabell namn '%-.64s'",
 "Den angivna frågan skulle troligen ta mycket long tid!  Kontrollar din WHERE och använd SET OPTION SQL_BIG_SELECTS=1 ifall du vill hantera stora joins",
@@ -117,7 +117,7 @@
 "Tabeller måste ha minst 1 kolumn",
 "Tabellen '%-.64s' är full",
 "Okänt karaktärset: '%-.64s'",
-"För många tabeller. MySQL can ha högst %d tabeller i en och samma join"
+"För många tabeller. MySQL can ha högst %d tabeller i en och samma join",
 "För många fält",
 "För stor total rad längd. Den högst tillåtna rad-längden, förutom BLOBs, är %d. Ändra några av dina fält till BLOB",
 "Tråd-stacken tog slut:  Har använt %ld av %ld bytes.  Använd 'mysqld -O thread_stack=#' ifall du behöver en större stack",
@@ -136,9 +136,9 @@
 "För att ändra lösenord för andra måste du ha rättigheter att uppdatera mysql databasen",
 "Hittade inte användaren i 'user' tabellen",
 "Rader: %ld  Uppdaterade: %ld  Varningar: %ld",
-"Kan inte skapa en ny tråd (errno %d)"
+"Kan inte skapa en ny tråd (errno %d)",
 "Antalet kolumner motsvarar inte antalet värden på rad: %ld",
-"Kunde inte stänga och öppna tabell: '%-.64s',
+"Kunde inte stänga och öppna tabell: '%-.64s",
 "Felaktig använding av NULL",
 "Fix fel '%-.64s' från REGEXP",
 "Man får ha både GROUP kolumner (MIN(),MAX(),COUNT()...) och fält i en fråga om man inte har en GROUP BY del",
@@ -147,7 +147,7 @@
 "%-.16s ej tillåtet för '%-.32s@%-.64s'\n för kolumn '%-.64s' i tabell '%-.64s'",
 "Felaktigt GRANT privilegium använt",
 "Felaktigt maskinnamn eller användarnamn använt med GRANT",
-"Det finns ingen tabell som heter '%-64s.%s'"
+"Det finns ingen tabell som heter '%-64s.%s'",
 "Det finns inget privilegium definierat för användare '%-.32s' på '%-.64s' för tabell '%-.64s'",
 "Du kan inte använda detta kommando med denna MySQL version",
 "Du har något fel i din syntax",
@@ -160,7 +160,7 @@
 "Kommunikationspaketen kom i fel ordning",
 "Kunde inte packa up kommunikationspaketet",
 "Fick ett fel vid läsning från klienten",
-"Fick 'timeout' vid läsning från klienten", 
+"Fick 'timeout' vid läsning från klienten",
 "Fick ett fel vid skrivning till klienten",
 "Fick 'timeout' vid skrivning till klienten",
 "Resultat strängen är längre än max_allowed_packet",

--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -203,7 +203,7 @@
 " '%-.64s'   ڦ   Ҧ צ",
 " '%-.64s'   ڦ  Τ (?) צ  ",
 ": ˦ æΦ ͦ     ",
-"æ     ¦ Φ 'max_binlog_cache_size' Ԧ  Ҧ. ¦  ͦ mysqld   ',
+"æ     ¦ Φ 'max_binlog_cache_size' Ԧ  Ҧ. ¦  ͦ mysqld   ",
 "æ       Ц,   SLAVE STOP",
 "æ   Ц, Ʀ Ц   SLAVE START",
 "  Ʀ  Ц,    ̦ Ʀæ   CHANGE MASTER TO",

--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -294,8 +294,10 @@ public:
  ~analyse()
  {
    if (f_info)
+    {
      for (field_info **f=f_info; f != f_end; f++)
 	delete (*f);
+    }
  }
  virtual void add() {}
  virtual bool change_columns(List<Item> &fields);