summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2014-06-04 21:53:15 +0400
committerAlexander Barkov <bar@mariadb.org>2014-06-04 21:53:15 +0400
commit284479c085f005a705d31e37e9cd85bb670d615e (patch)
tree044868e9c5a27a60750f3389ca63763f2bbc1ef0 /include/my_global.h
parent55bfabf9715c15df16adb4a3e8880deb4943df2b (diff)
parent661daf16f11ffa879ffb005008b6e73f6744e0ad (diff)
downloadmariadb-git-284479c085f005a705d31e37e9cd85bb670d615e.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 7607e02ce3f..09adc9989ef 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -483,6 +483,7 @@ typedef unsigned short ushort;
#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }
#define test(a) ((a) ? 1 : 0)
+#define MY_TEST(a) ((a) ? 1 : 0)
#define set_if_bigger(a,b) do { if ((a) < (b)) (a)=(b); } while(0)
#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))