Merge with 3.23.52

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-linux-build:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

2 files changed, 9 insertions, 2 deletions

diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build
index a8b12d8b4ae..44a9ad05fa2 100755
--- a/Build-tools/Do-linux-build
+++ b/Build-tools/Do-linux-build
@@ -16,6 +16,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \
   --prefix=/usr/local/mysql --with-extra-charset=complex \
   --enable-thread-safe-client --enable-local-infile \
   --with-server-suffix=-max
+nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz
 scripts/make_binary_distribution
 make dist
 Build-tools/Do-rpm --local
@@ -23,4 +24,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \
   --with-comment="Official MySQL Binary" \
   --prefix=/usr/local/mysql --with-extra-charset=complex \
   --enable-thread-safe-client --enable-local-infile
+nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz
 scripts/make_binary_distribution 
diff --git a/Build-tools/mysql-copyright-2 b/Build-tools/mysql-copyright-2
index 5aeb4bb81db..a0d30f308e5 100755
--- a/Build-tools/mysql-copyright-2
+++ b/Build-tools/mysql-copyright-2
@@ -89,13 +89,18 @@ sub add_copyright
   elsif ($ARGV =~ /\.c$/ ||
 	 $ARGV =~ /\.cc$/ ||
 	 $ARGV =~ /\.h$/ ||
-	 $ARGV =~ /\.yy$/ ||
-	 $ARGV =~ /-x86\.s$/)
+	 $ARGV =~ /\.yy$/)
   {
     $start_copyright="/* ";
     $line_copyright= "   ";
     $end_copyright=  " */";
   }
+	elsif ($ARGV =~ /-x86\.s$/)
+	{
+		$start_copyright="# ";
+		$line_copyright= "# ";
+		$end_copyright=  "";
+	}
   elsif ($ARGV =~ /\.s$/)
   {
     $start_copyright="! ";