Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged

25 files changed, 95 insertions, 92 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d861b073b6e..805e6860f65 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3343,7 +3343,6 @@ pthread_handler_decl(handle_connections_shared_memory,arg)
   HANDLE event_connect_answer= 0;
   ulong smem_buffer_length= shared_memory_buffer_length + 4;
   ulong connect_number= 1;
-  my_bool error_allow;
   char tmp[63];
   char *suffix_pos;
   char connect_number_char[22], *p;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 04bd232d0b7..66f8c3327a2 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2482,8 +2482,9 @@ int set_var_password::update(THD *thd)
  Functions to handle table_type
 ****************************************************************************/
 
+/* Based upon sys_var::check_enum() */
+
 bool sys_var_thd_table_type::check(THD *thd, set_var *var)
-  /* Based upon sys_var::check_enum() */
 {
   char buff[80];
   const char *value;
@@ -2506,6 +2507,7 @@ err:
   return 1;    
 }
 
+
 byte *sys_var_thd_table_type::value_ptr(THD *thd, enum_var_type type,
 					LEX_STRING *base)
 {
@@ -2513,9 +2515,10 @@ byte *sys_var_thd_table_type::value_ptr(THD *thd, enum_var_type type,
   val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
         thd->variables.*offset);
   const char *table_type= ha_get_table_type((enum db_type)val);
-  return (byte *)table_type;
+  return (byte *) table_type;
 }
 
+
 void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
 {
   if (type == OPT_GLOBAL)
@@ -2524,6 +2527,7 @@ void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
     thd->variables.*offset= (ulong) (global_system_variables.*offset);
 }
 
+
 bool sys_var_thd_table_type::update(THD *thd, set_var *var)
 {
   if (var->type == OPT_GLOBAL)
@@ -2533,6 +2537,7 @@ bool sys_var_thd_table_type::update(THD *thd, set_var *var)
   return 0;
 }
 
+
 /****************************************************************************
  Functions to handle sql_mode
 ****************************************************************************/
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 2e664d8b892..a77e6e4333b 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -272,10 +272,10 @@ character-set=latin2
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 59eef466ca3..1e04ef7340b 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -266,10 +266,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 992effea88e..e9b0ac12e29 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -274,10 +274,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index b57cb62814e..233f57cec28 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -263,10 +263,10 @@ character-set=latin1
 "ZLIB: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "ZLIB: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index fd4c6d3e52e..fa6201f9097 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -268,10 +268,10 @@ character-set=latin7
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 1e2c6fa4178..dbc4cfeae5e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -263,10 +263,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index d3aebcba5d3..4d8a6d44099 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -263,10 +263,10 @@ character-set=greek
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index ed38956da44..3a6e309435c 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -265,10 +265,10 @@ character-set=latin2
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index e85a134614f..fcc3379e138 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -263,10 +263,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 49efa03eef2..c4bd5dab028 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -265,10 +265,10 @@ character-set=ujis
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index b2be32402db..14112e5b6bd 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -263,10 +263,10 @@ character-set=euckr
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index c67ff6d8263..9b0274965a7 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -265,10 +265,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index f412e4f8615..906e4702cab 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -265,10 +265,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 715f17e3ccc..c9229d0c522 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -267,10 +267,10 @@ character-set=latin2
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index e98879508d6..9ff6325f935 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -264,10 +264,10 @@ character-set=latin1
 "Z_BUF_ERROR: Não suficiente espaço no buffer emissor para zlib (provavelmente, o comprimento dos dados descomprimidos está corrupto)",
 "Z_DATA_ERROR: Dados de entrada está corrupto para zlib",
 "%d linha(s) foi(foram) cortada(s) por group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Usando engine de armazenamento %s para tabela '%s'",
 "Combinação ilegal de collations (%s,%s) e (%s,%s) para operação '%s'",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 46ece3bc9ce..34dd64daa2d 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -267,10 +267,10 @@ character-set=latin2
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 40e8c585eb3..6f22d1b87fd 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -265,10 +265,10 @@ character-set=koi8r
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 4002ffe926c..98308190587 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -258,10 +258,10 @@ character-set=cp1250
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 7324906fca1..5decce35dfd 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -271,10 +271,10 @@ character-set=latin2
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 0db613ae4c7..00f31d351df 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -265,10 +265,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 96e124207ed..a53b6e4df3a 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -263,10 +263,10 @@ character-set=latin1
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d rad(er) kapades av group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Använder handler %s för tabell '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 587e599c01e..e3a496831a2 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -268,10 +268,10 @@ character-set=koi8u
 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
-"Record count is fewer than the column count at row %ld";
-"Record count is more than the column count at row %ld";
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-"Data truncated, out of range for column '%s' at row %ld";
+"Record count is fewer than the column count at row %ld",
+"Record count is more than the column count at row %ld",
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index ac517014108..5364357a24b 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2548,7 +2548,6 @@ my_bool grant_init(THD *org_thd)
     {
       if (hostname_requires_resolving(mem_check->host))
       {
-	char buff[MAX_FIELD_WIDTH];
 	sql_print_error("Warning: 'tables_priv' entry '%s %s@%s' "
 			"ignored in --skip-name-resolve mode.",
 			mem_check->tname, mem_check->user,