diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-30 18:57:21 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-30 18:57:21 +0300 |
| commit | a86390f01ae108baf07707d401e35c3c4e1e9041 (patch) | |
| tree | c1bcaea9558c224371254c107ba497d9242758b7 /include | |
| parent | a88c8630ec426c88cd7eae7acf2985a254d3faba (diff) | |
| download | mariadb-git-a86390f01ae108baf07707d401e35c3c4e1e9041.tar.gz | |
Update for running gcc 3.x (mainly on HPUX)
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names
Build-tools/Do-compile:
Added option --make-options
Docs/manual.texi:
Changelog
Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
Update for running gcc 3.x on HPUX
client/mysql.cc:
Portability fix
client/mysqlbinlog.cc:
Fix for using gcc 3.1
configure.in:
Fix for using gcc 3.1
include/my_global.h:
Fix for using gcc 3.1
include/my_pthread.h:
Removed warning on HPUX
innobase/configure.in:
Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
Test of new functions
mysql-test/r/rpl_get_lock.result:
Test of new functions
mysql-test/t/func_test.test:
Test of new functions
mysql-test/t/rpl_get_lock.test:
Test of new functions
mysys/my_tempnam.c:
Portability fix
sql/item_cmpfunc.cc:
Added comments to Item_cond_xor.
Fixed NULL handling for XOR
sql/item_create.cc:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
Cleanup XOR handling
sql/item_func.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
Moved chroot() to be exectued earlier.
sql/sql_db.cc:
Apply lower_case_table_names also to databases
sql/sql_parse.cc:
Apply lower_case_table_names also to databases
sql/sql_select.cc:
Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
Don't allow \ in database names
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/my_pthread.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2ad8a870048..c13b79cbc1f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -150,6 +150,13 @@ #define __LONG_MAX__ 2147483647 #endif +/* 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() {} } +#else +#define FIX_GCC_LINKING_PROBLEM +#endif + /* egcs 1.1.2 has a problem with memcpy on Alpha */ #if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) #define BAD_MEMCPY diff --git a/include/my_pthread.h b/include/my_pthread.h index 7e975a8185d..d1d507c06cf 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -429,6 +429,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #endif /* defined(__WIN__) */ #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) +#undef pthread_cond_timedwait #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) #define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, |