diff options
| author | unknown <serg@janus.mylan> | 2006-09-20 16:39:14 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2006-09-20 16:39:14 +0200 |
| commit | d551a55a1b236097e3912c66a91a17dea1600d7e (patch) | |
| tree | 26d251ebad9bb1f063bdb11d42614db78a52bc7a /include/my_global.h | |
| parent | b860539e37bb585794e144d5785906af13e0e1b9 (diff) | |
| parent | d83bc171b6775281d556604b47d6d13a8bf5cecf (diff) | |
| download | mariadb-git-d551a55a1b236097e3912c66a91a17dea1600d7e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/maria/Makefile.am:
merged
unittest/Makefile.am:
merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 539a2ea644f..85fa92663fa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -192,6 +192,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 |