SHOW VARIABLES LIKE ... are now case insensitive

Fixed stack overflow checking with crash-me with gcc 3.0.4
Using @@unknown_variable doesn't hang client anymore
Added @@VERSION variable


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Fixed typo
myisam/myisampack.c:
  Removed not used argument
mysql-test/r/show_check.result:
  Added test of case insensitive SHOW VARIABLES LIKE
mysql-test/r/variables.result:
  test of system variables
mysql-test/t/show_check.test:
  Added test of case insensitive SHOW VARIABLES LIKE
mysql-test/t/variables.test:
  test of system variables
sql/item_func.cc:
  Fixed stack overflow checking with crash-me with gcc 3.0.4
  Using @@unknown_variable doesn't hang client anymore
  Added @@VERSION variable
sql/mysql_priv.h:
  Fixed stack overflow checking with crash-me with gcc 3.0.4
sql/share/czech/errmsg.txt:
  Fixed wrong error message
sql/share/danish/errmsg.txt:
  Fixed wrong error message
sql/share/dutch/errmsg.txt:
  Fixed wrong error message
sql/share/english/errmsg.txt:
  Fixed wrong error message
sql/share/estonian/errmsg.txt:
  Fixed wrong error message
sql/share/french/errmsg.txt:
  Fixed wrong error message
sql/share/german/errmsg.txt:
  Fixed wrong error message
sql/share/greek/errmsg.txt:
  Fixed wrong error message
sql/share/hungarian/errmsg.txt:
  Fixed wrong error message
sql/share/italian/errmsg.txt:
  Fixed wrong error message
sql/share/japanese/errmsg.txt:
  Fixed wrong error message
sql/share/korean/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian-ny/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian/errmsg.txt:
  Fixed wrong error message
sql/share/polish/errmsg.txt:
  Fixed wrong error message
sql/share/portuguese/errmsg.txt:
  Fixed wrong error message
sql/share/romanian/errmsg.txt:
  Fixed wrong error message
sql/share/russian/errmsg.txt:
  Fixed wrong error message
sql/share/slovak/errmsg.txt:
  Fixed wrong error message
BitKeeper/deleted/.del-identity.result~e41453a364242503:
  not used file
BitKeeper/deleted/.del-identity.test~326f469b59105404:
  not used file
sql/share/spanish/errmsg.txt:
  Fixed wrong error message
sql/share/swedish/errmsg.txt:
  Fixed wrong error message
sql/share/ukrainian/errmsg.txt:
  Fixed wrong error message
sql/sql_show.cc:
  SHOW VARIABLES LIKE ... are now case insensitive

25 files changed, 63 insertions, 43 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 2e54aa56b4b..6579825690f 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -59,7 +59,7 @@ bool
 Item_func::fix_fields(THD *thd,TABLE_LIST *tables)
 {
   Item **arg,**arg_end;
-  char buff[sizeof(double)];			// Max argument in function
+  char buff[STACK_BUFF_ALLOC];			// Max argument in function
   binary=0;
   used_tables_cache=0;
   const_item_cache=1;
@@ -1058,7 +1058,7 @@ bool
 udf_handler::fix_fields(THD *thd,TABLE_LIST *tables,Item_result_field *func,
 			uint arg_count, Item **arguments)
 {
-  char buff[sizeof(double)];			// Max argument in function
+  char buff[STACK_BUFF_ALLOC];			// Max argument in function
   DBUG_ENTER("Item_udf_func::fix_fields");
 
   if (thd)
@@ -2161,9 +2161,12 @@ bool Item_func_match::eq(const Item *item, bool binary_cmp) const
 
 Item *get_system_var(LEX_STRING name)
 {
-  if (!strcmp(name.str,"IDENTITY"))
+  if (!my_strcasecmp(name.str,"IDENTITY"))
     return new Item_int((char*) "@@IDENTITY",
 			current_thd->insert_id(),21);
-  my_error(ER_UNKNOWN_SYSTEM_VARIABLE,MYF(0),name);
+  if (!my_strcasecmp(name.str,"VERSION"))
+    return new Item_string("@@VERSION",server_version,
+			   (uint) strlen(server_version));
+  net_printf(&current_thd->net, ER_UNKNOWN_SYSTEM_VARIABLE, name);
   return 0;
 }
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 657ca3274cd..4cee7d04ef0 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -73,22 +73,30 @@ void kill_one_thread(THD *thd, ulong id);
 #define MAX_FIELDS_BEFORE_HASH	32
 #define USER_VARS_HASH_SIZE     16
 #define STACK_MIN_SIZE		8192	// Abort if less stack during eval.
+#define STACK_BUFF_ALLOC	32	// For stack overrun checks
 #ifndef MYSQLD_NET_RETRY_COUNT
 #define MYSQLD_NET_RETRY_COUNT  10	// Abort read after this many int.
 #endif
 #define TEMP_POOL_SIZE          128
-/* The following parameters is to decide when to use an extra cache to
-   optimise seeks when reading a big table in sorted order */
+/*
+  The following parameters is to decide when to use an extra cache to
+   optimise seeks when reading a big table in sorted order
+*/
 #define MIN_FILE_LENGTH_TO_USE_ROW_CACHE (16L*1024*1024)
 #define MIN_ROWS_TO_USE_TABLE_CACHE	 100
 
-// The following is used to decide if MySQL should use table scanning
-// instead of reading with keys.  The number says how many evaluation of the
-// WHERE clause is comparable to reading one extra row from a table.
+/*
+  The following is used to decide if MySQL should use table scanning
+  instead of reading with keys.  The number says how many evaluation of the
+  WHERE clause is comparable to reading one extra row from a table.
+*/
 #define TIME_FOR_COMPARE   5	// 5 compares == one read
-// Number of rows in a reference table when refereed through a not unique key.
-// This value is only used when we don't know anything about the key
-// distribution.
+
+/*
+  Number of rows in a reference table when refereed through a not unique key.
+  This value is only used when we don't know anything about the key
+  distribution.
+*/
 #define MATCHING_ROWS_IN_OTHER_TABLE 10
 
 /* Don't pack string keys shorter than this (if PACK_KEYS=1 isn't used) */
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index d1638bee16e..093954c202b 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -203,7 +203,7 @@
 "S-Bí»ová chyba pøi zápisu na master",-A
 "-B®ádný sloupec nemá vytvoøen fulltextový index",-A
 "Nemohu prov-Bést zadaný pøíkaz, proto¾e existují aktivní zamèené tabulky nebo aktivní transakce",-A
-"Nezn-Bámá systémová promìnná '%-.64'",-A
+"Nezn-Bámá systémová promìnná '%-.64s'",-A
 "Tabulka '%-.64s' je ozna-Bèena jako poru¹ená a mìla by být opravena",-A
 "Tabulka '%-.64s' je ozna-Bèena jako poru¹ená a poslední (automatická?) oprava se nezdaøila",-A
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 6585f717a78..6ee6e23a18e 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -197,7 +197,7 @@
 "Netværksfejl ved skrivning til master",
 "Kan ikke finde en FULLTEXT nøgle som svarer til kolonne listen",
 "Kan ikke udføre den givne kommando fordi der findes aktive, låste tabeller eller fordi der udføres en transaktion",
-"Ukendt systemvariabel '%-.64'",
+"Ukendt systemvariabel '%-.64s'",
 "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",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index d14400edc69..b857eb3104d 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -200,7 +200,7 @@
 "Net fout tijdens schrijven naar master",
 "Kan geen FULLTEXT index vinden passend bij de kolom lijst",
 "Kan het gegeven commando niet uitvoeren, want u heeft actieve gelockte tabellen of een actieve transactie",
-"Onbekende systeem variabele '%-.64'",
+"Onbekende systeem variabele '%-.64s'",
 "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",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 384d2c846c2..b67c1e1a0df 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -194,7 +194,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 20891c7b001..d57f6871e12 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -198,7 +198,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Tundmatu süsteemne muutja '%-.64'",
+"Tundmatu süsteemne muutja '%-.64s'",
 "Tabel '%-.64s' on märgitud vigaseks ja tuleb parandada",
 "Tabel '%-.64s' on märgitud vigaseks ja viimane (automaatne?) parandamiskatse ebaõnnestus",
 "Warning:  Some non-transactional changed tables couldn't be rolled back",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 104e561d642..4848a3266bc 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -194,7 +194,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index d0a08a1e7a8..fe76c757d11 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -197,7 +197,7 @@
 "Netzfehler beim Schreiben zum Master",
 "Kann keinen FULLTEXT-Index finden der der Spaltenliste entspricht",
 "Kann das aktuelle Kommando wegen aktiver Tabellensperre oder aktiver Transaktion nicht ausführen",
-"Unbekannte System-Variabel '%-.64'",
+"Unbekannte System-Variabel '%-.64s'",
 "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.",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index f778cb857d7..b491b0ef1f9 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -194,7 +194,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 6ff12c8b49e..fc6a9ba0643 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -196,7 +196,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 7a3daca9a59..3da78e82d99 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -194,7 +194,7 @@
 "Errore di rete durante l'invio al master",
 "Impossibile trovare un indice FULLTEXT che corrisponda all'elenco delle colonne",
 "Impossibile eseguire il comando richiesto: tabelle sotto lock o transazione in atto",
-"Variabile di sistema '%-.64' sconosciuta",
+"Variabile di sistema '%-.64s' sconosciuta",
 "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)",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index fab60948943..dc2299e4336 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -196,7 +196,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 0dac448e2b2..79bf767a3c8 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -194,7 +194,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 78075c3990c..a583a541b71 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -196,7 +196,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 997d667f812..85fa1f04f63 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -196,7 +196,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index f317d99d48f..af484b4c850 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -198,7 +198,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index a3ae06d193f..7737fe6b1fd 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -194,7 +194,7 @@
 "Erro de rede na gravação do 'master'",
 "Não pode encontrar índice FULLTEXT que combine com a lista de colunas",
 "Não pode executar o comando dado porque você tem tabelas ativas travadas ou uma 'transaction' ativa",
-"Variável de sistema '%-.64' desconhecida",
+"Variável de sistema '%-.64s' desconhecida",
 "Tabela '%-.64s' está marcada como danificada e deve ser reparada",
 "Tabela '%-.64s' está marcada como danificada e a última reparação (automática?) falhou",
 "Aviso: Algumas tabelas não-transacionais alteradas não puderam ser reconstituídas ('rolled back')",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 26d9f34528a..e8927777b8a 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -198,7 +198,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index c02c47696b0..5c94f2ee31b 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -197,7 +197,7 @@
 "óÅÔÅ×ÁÑ ÏÛÉÂËÁ ÐÒÉ ÐÉÓÁÎÉÉ ÍÁÓÔÅÒÕ",
 "FULLTEXT ÉÎÄÅËÓ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÚÁÄÁÎÎÏÍÕ ÓÐÉÓËÕ ÓÔÏÌÂÃÏ×, ÎÅ ÎÁÊÄÅÎ",
 "îÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ ËÏÍÍÁÎÄÕ ÉÚ-ÚÁ ÁËÔÉ×ÎÙÈ locked ÔÁÂÌÉà ÉÌÉ ÁËÔÉ×ÎÏÊ ÔÒÁÎÚÁËÃÉÉ",
-"îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÐÅÒÅÍÅÎÎÁÑ '%-.64'",
+"îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÐÅÒÅÍÅÎÎÁÑ '%-.64s'",
 "ôÁÂÌÉÃÁ '%-.64s' ÐÏÍÅÞÅÎÁ ËÁË ÉÓÐÏÒÞÅÎÎÁÑ É ÄÏÌÖÎÁ ÂÙÔØ ÉÓÐÒÁ×ÌÅÎÁ",
 "ôÁÂÌÉÃÁ '%-.64s' ÐÏÍÅÞÅÎÁ ËÁË ÉÓÐÏÒÞÅÎÎÁÑ É ÐÏÓÌÅÄÎÑÑ ÐÏÐÙÔËÁ ÉÓÐÒÁ×ÌÅÎÉÑ (Á×ÔÏÍÁÔÉÞÅÓËÁÑ?) ÎÅ ÕÄÁÌÁÓØ",
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅËÏÔÏÒÙÅ ÎÅÔÒÁÎÚÁËÃÉÏÎÎÙÅ ÔÁÂÌÉÃÙ ÎÅ ÐÏÄÞÉÎÑÀÔÓÑ ROLLBACK",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 189db8a66f8..3f96880bda1 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -202,7 +202,7 @@
 "Net error writing to master",
 "Can't find FULLTEXT index matching the column list",
 "Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
+"Unknown system variable '%-.64s'",
 "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",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 57d4ac9646a..c718ac93fc4 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -195,7 +195,7 @@
 "Error de red escribiendo para el master",
 "No puedo encontrar índice FULLTEXT correspondiendo a la lista de columnas",
 "No puedo ejecutar el comando dado porque tienes tablas bloqueadas o una transición activa",
-"Desconocida variable de sistema '%-.64'",
+"Desconocida variable de sistema '%-.64s'",
 "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",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 1b7b6012a39..ce6bb0e80f0 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -194,7 +194,7 @@
 "Fick nätverksfel vid skrivning till master",
 "Hittar inte ett FULLTEXT index i kolumnlistan",
 "Kan inte exekvera kommandot emedan du har en låst tabell eller an aktiv transaktion",
-"Okänd system variabel '%-.64'",
+"Okänd system variabel '%-.64s'",
 "Tabell '%-.64s' är crashad och bör repareras med REPAIR TABLE",
 "Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades",
 "Warning:  Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 4508fc75c27..b167ebd5f3d 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -199,7 +199,7 @@
 "íÅÒÅÖÅ×Á ÐÏÍÉÌËÁ ÚÁÐÉÓÕ ÄÏ ÇÏÌÏ×ÎÏÇÏ",
 "îÅ ÍÏÖÕ ÚÎÁÊÔÉ FULLTEXT ¦ÎÄÅËÓ, ÝÏ ×¦ÄÐÏצÄÁ¤ ÐÅÒÅ̦ËÕ ÓÔÏ×Âæ×",
 "îÅ ÍÏÖÕ ×ÉËÏÎÁÔÉ ÐÏÄÁÎÕ ËÏÍÁÎÄÕ ÔÏÍÕ, ÝÏ ÔÁÂÌÉÃÑ ÚÁÂÌÏËÏ×ÁÎÁ ÁÂÏ ×ÉËÏÎÕ¤ÔØÓÑ ÔÒÁÎÚÁËæÑ",
-"îÅצÄÏÍÁ ÓÉÓÔÅÍÎÁ ÚͦÎÎÁ '%-.64'",
+"îÅצÄÏÍÁ ÓÉÓÔÅÍÎÁ ÚͦÎÎÁ '%-.64s'",
 "ôÁÂÌÉÃÀ '%-.64s' ÍÁÒËÏ×ÁÎÏ ÑË Ú¦ÐÓÏ×ÁÎÕ ÔÁ §§ ÐÏÔÒ¦ÂÎÏ ×¦ÄÎÏ×ÉÔÉ",
 "ôÁÂÌÉÃÀ '%-.64s' ÍÁÒËÏ×ÁÎÏ ÑË Ú¦ÐÓÏ×ÁÎÕ ÔÁ ÏÓÔÁÎΤ (Á×ÔÏÍÁÔÉÞÎÅ?) צÄÎÏ×ÌÅÎÎÑ ÎÅ ×ÄÁÌÏÓÑ",
 "úÁÓÔÅÒÅÖÅÎÎÑ: äÅÑ˦ ÎÅÔÒÁÎÚÁËæÊΦ ÚͦÎÉ ÔÁÂÌÉÃØ ÎÅ ÍÏÖÎÁ ÂÕÄÅ ÐÏ×ÅÒÎÕÔÉ",
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 018b43b11c8..8cfac1675b0 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -567,21 +567,30 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
   {
     packet->length(0);
     net_store_data(packet, table->table_name);
-    // a hack - we need to reserve some space for the length before
-    // we know what it is - let's assume that the length of create table
-    // statement will fit into 3 bytes ( 16 MB max :-) )
+    /*
+      A hack - we need to reserve some space for the length before
+      we know what it is - let's assume that the length of create table
+      statement will fit into 3 bytes ( 16 MB max :-) )
+    */
     ulong store_len_offset = packet->length();
     packet->length(store_len_offset + 4);
     if (store_create_info(thd, table, packet))
       DBUG_RETURN(-1);
     ulong create_len = packet->length() - store_len_offset - 4;
     if (create_len > 0x00ffffff) // better readable in HEX ...
-      DBUG_RETURN(1);  // just in case somebody manages to create a table
-    // with *that* much stuff in the definition
+    {
+      /*
+	Just in case somebody manages to create a table
+	with *that* much stuff in the definition
+      */
+      DBUG_RETURN(1);
+    }
 
-    // now we have to store the length in three bytes, even if it would fit
-    // into fewer, so we cannot use net_store_data() anymore,
-    // and do it ourselves
+    /*
+      Now we have to store the length in three bytes, even if it would fit
+      into fewer bytes, so we cannot use net_store_data() anymore,
+      and do it ourselves
+    */
     char* p = (char*)packet->ptr() + store_len_offset;
     *p++ = (char) 253; // The client the length is stored using 3-bytes
     int3store(p, create_len);
@@ -1125,7 +1134,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
   pthread_mutex_lock(&LOCK_status);
   for (i=0; variables[i].name; i++)
   {
-    if (!(wild && wild[0] && wild_compare(variables[i].name,wild)))
+    if (!(wild && wild[0] && wild_case_compare(variables[i].name,wild)))
     {
       packet2.length(0);
       net_store_data(&packet2,variables[i].name);