diff options
| -rwxr-xr-x | Build-tools/Do-compile | 7 | ||||
| -rw-r--r-- | Docs/manual.texi | 5 | ||||
| -rw-r--r-- | sql/slave.cc | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
4 files changed, 15 insertions, 5 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 78f4128873f..011ad9662de 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -27,11 +27,11 @@ if (defined($gcc_version) && ! $opt_config_env) $tmp=`$gcc_version -v 2>&1`; if ($tmp =~ /version 2\.7\./) { - $opt_config_env= 'CC=gcc CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer"'; + $opt_config_env= 'CC=gcc CFLAGS="-O2 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fno-omit-frame-pointer"'; } else { - $opt_config_env= 'CC=gcc CFLAGS="-O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"'; + $opt_config_env= 'CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"'; } } @@ -68,6 +68,9 @@ if ($opt_stage == 0) if (-x "$host/bin/mysqladmin") { log_system("$host/bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown"); + log_system("$host/bin/mysqladmin --no-defaults -u root -P $mysql_tcp_port -h $host -s shutdown"); + log_system("$host/bin/mysqladmin --no-defaults -u root -P 9306 -h $host -s shutdown"); + log_system("$host/bin/mysqladmin --no-defaults -u root -P 9307 -h $host -s shutdown"); } system("mkdir $host") if (! -d $host); system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); diff --git a/Docs/manual.texi b/Docs/manual.texi index 6c84aded904..1e8b509f0b8 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -4596,6 +4596,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @image{Flags/japan} Japan [Soft Agency] @ @uref{http://www.softagency.co.jp/MySQL, WWW} +@item +@c EMAIL: takafumi@u-aizu.ac.jp (Takafumi Hayashi) +@image{Flags/japan} Japan [u-aizu.ac.jp/Aizu] @ +@uref{ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com, FTP} + @c @item @c Ok 980109 Removed 990730 @c EMAIL: satoshi@HappySize.co.jp (Satoshi TATSUOKA) diff --git a/sql/slave.cc b/sql/slave.cc index e704f471781..f0e4236c29d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -849,7 +849,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) mi->inc_pos(event_len); flush_master_info(mi); - --slave_skip_counter; + if(slave_skip_counter) + --slave_skip_counter; delete ev; return 0; // avoid infinite update loops } diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5204c22962f..52b26429048 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -140,10 +140,11 @@ BuildMySQL() { # support assembler speedups. sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ CC=\"${MYSQL_BUILD_CC:-egcs}\" \ - CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O6}\" \ + CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O6 -fno-omit-frame-pointer}\" \ CXX=\"${MYSQL_BUILD_CXX:-egcs}\" \ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O6 \ - -felide-constructors -fno-exceptions -fno-rtti}\" \ + -felide-constructors -fno-exceptions -fno-rtti \ + -fno-omit-frame-pointer}\" \ ./configure \ $* \ --enable-assembler \ |