From 33ec68e127d515bc98be3ba0d9f88ec0d4e2b5f3 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Mon, 26 Mar 2001 21:03:08 -0700
Subject: [PATCH] worked around gcc bug to make compile-pentium-gcov work
 increase coverage for table.cc in mysql_rm_table() ingore temporary gcov
 files fixed bug in replication test case

BitKeeper/etc/ignore:
  added *.da
BUILD/compile-pentium-gcov:
  do not build shared libraries - combination of -fPIC and the coverage flags
  triggers a bug in gcc, apparently - problem went away after adding
  --disable-shared
mysql-test/t/flush.test:
  extra test to increase coverage of table.cc
mysql-test/t/rpl000016.test:
  fixed bug in test case - insert may be concurrent, so we may read the
  table on the slave before the last insert becomes visible even when the
  master position is up to date if we do not
  lock it explicitly
---
 .bzrignore                  | 4 ++++
 BUILD/compile-pentium-gcov  | 2 +-
 mysql-test/t/flush.test     | 9 +++++++++
 mysql-test/t/rpl000016.test | 4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index caf62f16682..23eac357111 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -199,3 +199,7 @@ bdb/dist/tags
 bdb/build_unix/*
 sql/.gdbinit
 BitKeeper/etc/level
+*.gcov
+*.bb
+*.bbg
+*.da
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 4cb4ddb8057..6b5c432e999 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs --disable-shared"
 
 . "$path/FINISH.sh"
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 773becfeba1..94586519c66 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -22,4 +22,13 @@ while ($1)
 
 connection con1;
 select * from t1;
+connection con2;
+flush tables with read lock;
+--error 1099;
 drop table t2;
+connection con1;
+send drop table t2;
+connection con2;
+unlock tables;
+connection con1;
+reap;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index a12fde7eb4c..be694b0e434 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -85,7 +85,11 @@ slave stop;
 slave start;
 sync_with_master;
 show slave status;
+# because of concurrent insert, the table may not be up to date
+# if we do not lock
+lock tables t3 read;
 select count(*) from t3 where n = 4;
+unlock tables;
 #clean up
 connection master;
 drop table if exists t1,t2,t3;