From 9a5908316367080a3c41043f2657a056fb5ad165 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com/narttu.mysql.fi" <>
Date: Wed, 20 Jun 2007 19:22:27 +0300
Subject: [PATCH 1/3] Allow multiple calls to mysql_server_end() (Part of fix
 for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit) Give
 correct error message if InnoDB table is not found (This allows us to drop a
 an innodb table that is not in the InnoDB registery)

---
 .bzrignore                       |  3 +++
 libmysql/libmysql.c              | 15 +++++++++++++++
 mysql-test/r/innodb_mysql.result |  8 ++++++++
 mysql-test/t/innodb_mysql.test   | 14 ++++++++++++++
 sql/ha_innodb.cc                 |  2 +-
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 8c632f8f890..e7a7a1c27dc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1341,3 +1341,6 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+debian/control
+debian/defs.mk
+include/abi_check
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index e426d2c549e..121167763ed 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
 }
 
 
+/*
+  Free all memory and resources used by the client library
+
+  NOTES
+    When calling this there should not be any other threads using
+    the library.
+
+    To make things simpler when used with windows dll's (which calls this
+    function automaticly), it's safe to call this function multiple times.
+*/
+
+
 void STDCALL mysql_server_end()
 {
+  if (!mysql_client_init)
+    return;
+
 #ifdef EMBEDDED_LIBRARY
   end_embedded_server();
 #endif
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 34eb831e7db..4720c7c2e2e 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -625,4 +625,12 @@ t1	CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='123'
 drop table t1;
+create table t1 (a int) engine=innodb;
+select * from t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+drop table t1;
+drop table t2;
+ERROR 42S02: Unknown table 't2'
+create table t2 (a int);
+drop table t2;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index e6d94fe1627..578a81f355e 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -605,4 +605,18 @@ alter table t1 comment '123';
 show create table t1;
 drop table t1;
 
+#
+# Test bug when trying to drop data file which no InnoDB directory entry
+#
+
+create table t1 (a int) engine=innodb;
+copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t2.frm;
+--error 1146
+select * from t2;
+drop table t1;
+--error 1051
+drop table t2;
+create table t2 (a int);
+drop table t2;
+
 --echo End of 5.0 tests
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 455c0968050..a3676bd7e1b 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -504,7 +504,7 @@ convert_error_code_to_mysql(
 
  	} else if (error == (int) DB_TABLE_NOT_FOUND) {
 
-    		return(HA_ERR_KEY_NOT_FOUND);
+    		return(HA_ERR_NO_SUCH_TABLE);
 
   	} else if (error == (int) DB_TOO_BIG_RECORD) {
 

From 1988c1c66853d40d5ff3d6feb230256a9b117977 Mon Sep 17 00:00:00 2001
From: "antony@ppcg5.local" <>
Date: Fri, 6 Jul 2007 11:35:10 -0700
Subject: [PATCH 2/3] fix test for bug29299

---
 mysql-test/r/fulltext2.result | 12 ------------
 mysql-test/r/fulltext3.result | 13 +++++++++++++
 mysql-test/t/fulltext2.test   | 12 ------------
 mysql-test/t/fulltext3.test   | 24 ++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 mysql-test/r/fulltext3.result
 create mode 100644 mysql-test/t/fulltext3.test

diff --git a/mysql-test/r/fulltext2.result b/mysql-test/r/fulltext2.result
index f6bb4e4965a..f6a4b20bc22 100644
--- a/mysql-test/r/fulltext2.result
+++ b/mysql-test/r/fulltext2.result
@@ -241,15 +241,3 @@ select * from t1 where match a against('ab c' in boolean mode);
 a
 drop table t1;
 set names latin1;
-CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
-SET NAMES utf8;
-INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
-SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
-HEX(a)
-BEF361616197C22061616161
-DELETE FROM t1 LIMIT 1;
-CHECK TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-SET NAMES latin1;
-DROP TABLE t1;
diff --git a/mysql-test/r/fulltext3.result b/mysql-test/r/fulltext3.result
new file mode 100644
index 00000000000..019d5f472ed
--- /dev/null
+++ b/mysql-test/r/fulltext3.result
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
+SET NAMES utf8;
+INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
+SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
+HEX(a)
+BEF361616197C22061616161
+DELETE FROM t1 LIMIT 1;
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SET NAMES latin1;
+DROP TABLE t1;
diff --git a/mysql-test/t/fulltext2.test b/mysql-test/t/fulltext2.test
index 99209dc8543..fd97f795534 100644
--- a/mysql-test/t/fulltext2.test
+++ b/mysql-test/t/fulltext2.test
@@ -220,16 +220,4 @@ select * from t1 where match a against('ab c' in boolean mode);
 drop table t1;
 set names latin1;
 
-#
-# BUG#29299 - repeatable myisam fulltext index corruption
-#
-CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
-SET NAMES utf8;
-INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
-SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
-DELETE FROM t1 LIMIT 1;
-CHECK TABLE t1;
-SET NAMES latin1;
-DROP TABLE t1;
-
 # End of 4.1 tests
diff --git a/mysql-test/t/fulltext3.test b/mysql-test/t/fulltext3.test
new file mode 100644
index 00000000000..a57fd48daaa
--- /dev/null
+++ b/mysql-test/t/fulltext3.test
@@ -0,0 +1,24 @@
+--source include/have_gbk.inc
+#
+# test of new fulltext search features
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+#
+# BUG#29299 - repeatable myisam fulltext index corruption
+#
+CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));
+SET NAMES utf8;
+INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);
+SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);
+DELETE FROM t1 LIMIT 1;
+CHECK TABLE t1;
+SET NAMES latin1;
+DROP TABLE t1;
+
+# End of 5.0 tests
+

From db649ad5d1428051fe39cb42c782fb2ecea4d961 Mon Sep 17 00:00:00 2001
From: "knielsen@ymer.(none)" <>
Date: Sat, 7 Jul 2007 07:46:17 +0200
Subject: [PATCH 3/3] Bug #29543 GCov information not written in case of crash.

For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.

Fix this by explicitly calling the __gcov_flush function in our crash handler.
---
 BUILD/compile-pentium-gcov | 5 +++--
 sql/stacktrace.c           | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 26475824570..0d561d5b147 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -13,8 +13,9 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"
 
 # The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
 # code with profiling information used by gcov.
-# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
-extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"
+# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
+# The -DHAVE_gcov enables code to write out coverage info even when crashing.
+extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index d8e9b7fd883..c947beafac3 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -241,6 +241,15 @@ void write_core(int sig)
 void write_core(int sig)
 {
   signal(sig, SIG_DFL);
+#ifdef HAVE_gcov
+  /*
+    For GCOV build, crashing will prevent the writing of code coverage
+    information from this process, causing gcov output to be incomplete.
+    So we force the writing of coverage information here before terminating.
+  */
+  extern void __gcov_flush(void);
+  __gcov_flush();
+#endif
   pthread_kill(pthread_self(), sig);
 #if defined(P_MYID) && !defined(SCO)
   /* On Solaris, the above kill is not enough */