Merge with 3.23.52

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 

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="! ";

Docs/manual.texi

@@ -31453,7 +31453,7 @@ mysql> SELECT 'David!' LIKE 'David_';
         -> 1
 mysql> SELECT 'David!' LIKE '%D%v%';
         -> 1
-mysql> select TRUNCATE(-1,999,1);
+mysql> select TRUNCATE(-1.999,1);
         -> -1.9
 @end example
 

mysql-test/r/rpl_alter.result

+n	m
+1	2
+n
+45

mysql-test/t/rpl_alter.test

+source include/master-slave.inc;
+connection master;
+use test;
+drop database if exists d1;
+create database d1;
+create table d1.t1 ( n int);
+alter table d1.t1 add m int;
+insert into d1.t1 values (1,2);
+create table d1.t2 (n int);
+insert into d1.t2 values (45);
+rename table d1.t2 to d1.t3, d1.t1 to d1.t2;
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from d1.t2;
+select * from d1.t3;
+connection master;
+drop database d1;
+save_master_pos;
+connection slave;
+sync_with_master;

sql/mysqld.cc

@@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg)
   abort_loop = 1;
 
   // unblock select()
-  so_cancel( ip_sock);
-  so_cancel( unix_sock);
+  so_cancel(ip_sock);
+  so_cancel(unix_sock);
 
   return 0;
 }

sql/sql_base.cc

@@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd)
     *--end = 0;					// Remove last ','
     thd->query_length = (uint)(end-query);
     Query_log_event qinfo(thd, query);
+    qinfo.error_code=0;
     mysql_bin_log.write(&qinfo);
     thd->query_length = save_query_len;
   }