From 1d5f8d82b22e2f488a179af90c3ca65bdc997945 Mon Sep 17 00:00:00 2001 From: "mwagner@evoq.mwagner.org" <> Date: Tue, 13 Feb 2001 19:20:43 -0600 Subject: [PATCH 1/5] manual.texi Added FTP mirror in Japan. --- Docs/manual.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Docs/manual.texi b/Docs/manual.texi index 9eebc701689..4c46b608264 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -4589,6 +4589,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) From 73db84fefb7bdbf41d11792f6a2db21b1ed61358 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 14 Feb 2001 12:51:49 -0700 Subject: [PATCH 2/5] sql/slave.cc fixed skipping bug in bi-directional replication --- sql/slave.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/slave.cc b/sql/slave.cc index 5a110b6921b..c05b3478de0 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 } From 4fffd9dcd9332f8fe3b87059fa2add34557ca516 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 14 Feb 2001 13:46:13 -0700 Subject: [PATCH 3/5] mysql-test/r/fulltext.result after Indrek's bugfix in show create table, the result has two extra spaces --- mysql-test/r/fulltext.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index a08b5da99a4..025cd022cd4 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -17,6 +17,6 @@ Table Create Table t2 CREATE TABLE `t2` ( `ticket` int(11) default NULL, `inhalt` text, - KEY `tig`(`ticket`), - FULLTEXT KEY `tix`(`inhalt`) + KEY `tig` (`ticket`), + FULLTEXT KEY `tix` (`inhalt`) ) TYPE=MyISAM From d47b6e19a91d10a34254f39d128065114fbe6825 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 14 Feb 2001 15:09:38 -0700 Subject: [PATCH 4/5] keep frame pointer --- Build-tools/Do-compile | 4 ++-- support-files/mysql.spec.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 78f4128873f..b0951246c46 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"'; } } 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 \ From d98fb22b22381a42ffec6db5fe07a678c7a0912c Mon Sep 17 00:00:00 2001 From: "sasha@work.mysql.com" <> Date: Wed, 14 Feb 2001 23:14:23 +0100 Subject: [PATCH 5/5] Do-compile monty's uncommitted stuff --- Build-tools/Do-compile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 78f4128873f..1fb741fb0da 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 " CXX=gcc CXXFLAGS="-O2 "'; } 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 " CXX=gcc CXXFLAGS="-O3 -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);