diff options
| author | unknown <monty@mysql.com> | 2004-07-09 10:55:47 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-09 10:55:47 +0300 |
| commit | a4b3eec910a5d1b8fe69abb73971c6bf170a763a (patch) | |
| tree | 58bcacb82f42a18ece2331060a612980fa1a1c04 /include | |
| parent | b42209774aa80452bee797238fbe9bd4006fffce (diff) | |
| parent | 6e18271f1c5979a3c337c23c341e75175b1d8b93 (diff) | |
| download | mariadb-git-a4b3eec910a5d1b8fe69abb73971c6bf170a763a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index f5c14ea3e10..3c35ade8383 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -213,7 +213,11 @@ C_MODE_END /* 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() {return 0;} } +#define FIX_GCC_LINKING_PROBLEM \ +extern "C" { int __cxa_pure_virtual() {\ + DBUG_ASSERT("Pure virtual method called." == "Aborted");\ + return 0;\ +} } #else #define FIX_GCC_LINKING_PROBLEM #endif |