diff options
| -rwxr-xr-x | Build-tools/Do-linux-build | 2 | ||||
| -rwxr-xr-x | Build-tools/mysql-copyright-2 | 9 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_alter.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_alter.test | 21 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_base.cc | 1 |
7 files changed, 38 insertions, 5 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="! "; diff --git a/Docs/manual.texi b/Docs/manual.texi index 9ecd29ecb70..d3f5995124e 100644 --- a/Docs/manual.texi +++ b/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 diff --git a/mysql-test/r/rpl_alter.result b/mysql-test/r/rpl_alter.result new file mode 100644 index 00000000000..7883e725e3a --- /dev/null +++ b/mysql-test/r/rpl_alter.result @@ -0,0 +1,4 @@ +n m +1 2 +n +45 diff --git a/mysql-test/t/rpl_alter.test b/mysql-test/t/rpl_alter.test new file mode 100644 index 00000000000..a65605f703e --- /dev/null +++ b/mysql-test/t/rpl_alter.test @@ -0,0 +1,21 @@ +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; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b6481d4e787..f1e863b830e 100644 --- a/sql/mysqld.cc +++ b/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; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5741be69032..d93b40180ee 100644 --- a/sql/sql_base.cc +++ b/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; } |