diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-06-27 17:51:35 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-06-27 17:51:35 +0300 |
| commit | cfdd73369c0c2d57908af8dc727de33567fe9e0b (patch) | |
| tree | 12bdcd18fb3072cb578c358e9acd8f5a8df3f19e /include/my_global.h | |
| parent | a0fa27cf359397d721272635482a7d03687ad241 (diff) | |
| parent | 5444b55cbbab69a508e6c477a1b9580eff969da1 (diff) | |
| download | mariadb-git-cfdd73369c0c2d57908af8dc727de33567fe9e0b.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into hynda.mysql.fi:/home/my/mysql-maria
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index d6f331019f6..af9c31cf34f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -231,6 +231,8 @@ #endif #undef inline_test_2 #undef inline_test_1 +/* helper macro for "instantiating" inline functions */ +#define STATIC_INLINE static inline /* The following macros are used to control inlining a bit more than @@ -1001,6 +1003,8 @@ typedef long long intptr; #error sizeof(void *) is neither sizeof(int) nor sizeof(long) nor sizeof(long long) #endif +#define MY_ERRPTR ((void*)(intptr)1) + #ifdef USE_RAID /* The following is done with a if to not get problems with pre-processors @@ -1462,6 +1466,7 @@ do { doubleget_union _tmp; \ #define dlerror() "" #endif + #ifndef __NETWARE__ /* * Include standard definitions of operator new and delete. @@ -1487,5 +1492,13 @@ inline void operator delete[](void*, void*) { /* Do nothing */ } /* Length of decimal number represented by INT64. */ #define MY_INT64_NUM_DECIMAL_DIGITS 21 + +/* + Only Linux is known to need an explicit sync of the directory to make sure a + file creation/deletion/renaming in(from,to) this directory durable. +*/ +#ifdef TARGET_OS_LINUX +#define NEED_EXPLICIT_SYNC_DIR 1 +#endif #endif /* my_global_h */ |