diff options
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index c13b79cbc1f..8dd509b9b54 100644 --- 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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0b11ee89c3f..8c9854fdcb9 100644 --- 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 |