Commit b1f7c125 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge with 3.23.52

parents 4d703060 0762b00d

Build-tools/Do-linux-build

+2 −0
Original line number Diff line number Diff line
@@ -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

+7 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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
0 → 100644



+4
−0






























Original line number
Diff line number
Diff line













n	m













1	2













n













45
























mysql-test/t/rpl_alter.test
0 → 100644



+21
−0






























Original line number
Diff line number
Diff line













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;