Commit 9acfbcdc authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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

parents 02cc5cad f160def2

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -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