Added nety_retry_count as a changeable variable

Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap


Docs/manual.texi:
  Added nety_retry_count as a changeable variables
include/mysql_com.h:
  Added nety_retry_count as a changeable variables
libmysql/libmysql.c:
  Added nety_retry_count as a changeable variables
mysql-test/r/olap.result:
  Fixed wrong error message
mysql-test/r/variables.result:
  Update for freebsd
mysql-test/t/variables.test:
  Update for freebsd
scripts/make_binary_distribution.sh:
  Make safe_mysqld a symlink to mysqld_safe in binary distribution.
sql/item_func.cc:
  Cleaned up tmp_table_field() handling.
sql/item_func.h:
  Cleaned up tmp_table_field() handling.
sql/item_strfunc.h:
  Cleaned up tmp_table_field() handling.
sql/item_timefunc.h:
  Cleaned up tmp_table_field() handling.
sql/mysql_priv.h:
  Added nety_retry_count as a changeable variables
sql/mysqld.cc:
  Added nety_retry_count as a changeable variables
  Allow one to specify a defaults file to be read when installing MySQL as a service.
sql/net_pkg.cc:
  Added nety_retry_count as a changeable variables
sql/net_serv.cc:
  Added nety_retry_count as a changeable variables
sql/set_var.cc:
  Added nety_retry_count as a changeable variables
sql/share/czech/errmsg.txt:
  Fixed wrong error message
sql/share/danish/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
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_class.cc:
  Indentaion cleanup
sql/sql_class.h:
  Fixed wrong error message
sql/sql_parse.cc:
  Fixed problem with CTRL-C when using mysqld --bootstrap
sql/sql_select.cc:
  Ensure that select terminates if create_myisam_from_heap() fails.
sql/sql_yacc.yy:
  Portability fix

21 files changed, 21 insertions, 21 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 18b4c3ad2a8..4acb152a22b 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -245,4 +245,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 7d409e3133f..e017b0337c8 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -239,4 +239,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 04150b67084..8a10d0351f5 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 2a0233ca949..161310f05c9 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -241,4 +241,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 42f83e6eed2..893a65747b8 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 0cd3f8cd902..5e886f9a2c9 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -239,4 +239,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index bed0afe8286..4f49e1b4e08 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index a3c4f945351..8cd486b5f63 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -238,4 +238,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 39c9635cc91..5cd026db0ab 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f146f03e687..70e4ca55c4c 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -238,4 +238,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index c3ab3d5d680..1e659227e0a 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index a0191ba86d7..3b4efe7602b 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -238,4 +238,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 8d87c00e1b3..535087320c6 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -238,4 +238,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index def94b8795a..7aed210f6e4 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -240,4 +240,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 9c3bf3b32a1..2a635558055 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index fd12a1f3a64..59b913c0a1a 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -240,4 +240,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index dfe3b4a2f92..4e8e9508b73 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -239,4 +239,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 8e9433396fc..12b32da0f64 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -244,4 +244,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 57314579c63..c8c33152cc0 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -237,4 +237,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 7a4d17cfdfa..8c24be8f819 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -236,4 +236,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index d8d9349b56a..2b54d1f6098 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -241,4 +241,4 @@
 "Wrong argument type to variable '%-.64s'",
 "Variable '%-.64s' can only be set, not read",
 "Wrong usage/placement of '%s'",
-"This version of MySQL doesn't yet support '%s',"
+"This version of MySQL doesn't yet support '%s'",