Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

854814ad · unknown · 655d9786 · bbe55cd1 · 854814ad · 854814ad
Commit 854814ad authored Jun 30, 2002 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

include/my_global.h include/my_global.h +1 -1

sql/mysqld.cc sql/mysqld.cc +2 -0

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -152,7 +152,7 @@

 /* Fix problem when linking c++ programs with gcc 3.x */
 #ifdef DEFINE_CXA_PURE_VIRTUAL
-#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {} }
+#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {return 0;} }
 #else
 #define FIX_GCC_LINKING_PROBLEM
 #endif

--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4651,4 +4651,6 @@ template class I_List<THD>;
 template class I_List_iterator<THD>;
 template class I_List<i_string>;
 template class I_List<i_string_pair>;
+
+FIX_GCC_LINKING_PROBLEM
 #endif