merge with 3.23 to get bugfixes for <=> NULL and --bind-address

Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23

1 files changed, 6 insertions, 0 deletions

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 8d647ef0d82..52c1951f48f 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -72,6 +72,12 @@ if (@config_env > 0)
 	$opt_config_env= join(" ", @config_env);
 }
 
+if (@config_env > 0)
+{
+	chomp(@config_env);
+	$opt_config_env= join(" ", @config_env);
+}
+
 chomp($host=`hostname`);
 $full_host_name=$host;
 $connect_option= ($opt_tcpip ? "--host=$host" : "");