Commit 9424f80f authored by unknown's avatar unknown

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
parents 4249f4cb f97e1b6a
No related merge requests found
...@@ -16,6 +16,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \ ...@@ -16,6 +16,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \
--prefix=/usr/local/mysql --with-extra-charset=complex \ --prefix=/usr/local/mysql --with-extra-charset=complex \
--enable-thread-safe-client --enable-local-infile \ --enable-thread-safe-client --enable-local-infile \
--with-server-suffix=-max --with-server-suffix=-max
nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz
scripts/make_binary_distribution scripts/make_binary_distribution
make dist make dist
Build-tools/Do-rpm --local Build-tools/Do-rpm --local
...@@ -23,4 +24,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \ ...@@ -23,4 +24,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \
--with-comment="Official MySQL Binary" \ --with-comment="Official MySQL Binary" \
--prefix=/usr/local/mysql --with-extra-charset=complex \ --prefix=/usr/local/mysql --with-extra-charset=complex \
--enable-thread-safe-client --enable-local-infile --enable-thread-safe-client --enable-local-infile
nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz
scripts/make_binary_distribution scripts/make_binary_distribution
...@@ -89,13 +89,18 @@ sub add_copyright ...@@ -89,13 +89,18 @@ sub add_copyright
elsif ($ARGV =~ /\.c$/ || elsif ($ARGV =~ /\.c$/ ||
$ARGV =~ /\.cc$/ || $ARGV =~ /\.cc$/ ||
$ARGV =~ /\.h$/ || $ARGV =~ /\.h$/ ||
$ARGV =~ /\.yy$/ || $ARGV =~ /\.yy$/)
$ARGV =~ /-x86\.s$/)
{ {
$start_copyright="/* "; $start_copyright="/* ";
$line_copyright= " "; $line_copyright= " ";
$end_copyright= " */"; $end_copyright= " */";
} }
elsif ($ARGV =~ /-x86\.s$/)
{
$start_copyright="# ";
$line_copyright= "# ";
$end_copyright= "";
}
elsif ($ARGV =~ /\.s$/) elsif ($ARGV =~ /\.s$/)
{ {
$start_copyright="! "; $start_copyright="! ";
......
...@@ -31453,7 +31453,7 @@ mysql> SELECT 'David!' LIKE 'David_'; ...@@ -31453,7 +31453,7 @@ mysql> SELECT 'David!' LIKE 'David_';
-> 1 -> 1
mysql> SELECT 'David!' LIKE '%D%v%'; mysql> SELECT 'David!' LIKE '%D%v%';
-> 1 -> 1
mysql> select TRUNCATE(-1,999,1); mysql> select TRUNCATE(-1.999,1);
-> -1.9 -> -1.9
@end example @end example
n m
1 2
n
45
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;
...@@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg) ...@@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg)
abort_loop = 1; abort_loop = 1;
// unblock select() // unblock select()
so_cancel( ip_sock); so_cancel(ip_sock);
so_cancel( unix_sock); so_cancel(unix_sock);
return 0; return 0;
} }
......
...@@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd) ...@@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd)
*--end = 0; // Remove last ',' *--end = 0; // Remove last ','
thd->query_length = (uint)(end-query); thd->query_length = (uint)(end-query);
Query_log_event qinfo(thd, query); Query_log_event qinfo(thd, query);
qinfo.error_code=0;
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
thd->query_length = save_query_len; thd->query_length = save_query_len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment