diff options
| author | unknown <kent@mysql.com> | 2005-12-03 21:45:05 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-03 21:45:05 +0100 |
| commit | 01e0b848b55a542030baa51b4000290bfbe84c71 (patch) | |
| tree | 399bac6f7d9fc11ff393aa7c572ea168c866fa82 /include/my_global.h | |
| parent | 0c818ba62fa802665cfe9880c90d6faaa0efd6c6 (diff) | |
| parent | bbaf62b4aa87170c7927ec42f3714e748d861459 (diff) | |
| download | mariadb-git-01e0b848b55a542030baa51b4000290bfbe84c71.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/sp.result:
Auto merged
sql/log.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 234cc2f64dc..76ad59f70cb 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -541,6 +541,17 @@ typedef unsigned short ushort; #define __attribute__(A) #endif +/* + Wen using the embedded library, users might run into link problems, + dupicate declaration of __cxa_pure_virtual, solved by declaring it a + weak symbol. +*/ +#ifdef USE_MYSYS_NEW +C_MODE_START +int __cxa_pure_virtual () __attribute__ ((weak)); +C_MODE_END +#endif + /* From old s-system.h */ /* |