summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorguilhem@gbichot4.local <>2008-02-18 23:29:39 +0100
committerguilhem@gbichot4.local <>2008-02-18 23:29:39 +0100
commit9e2b31b0268a05a94032ba96c0830536ce983685 (patch)
tree7bffd7a5bcb1eea8fb0183e3a4e3a40cf6a783a6 /regex
parentccd53222d61d25ae2702d87a3b617a1f835eedc7 (diff)
downloadmariadb-git-9e2b31b0268a05a94032ba96c0830536ce983685.tar.gz
Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
value" error even though the value was correct): a C function in my_getopt.c was taking bool* in parameter and was called from C++ sql_plugin.cc, but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny mismatches. Fixed, all other occurences of bool in C are removed, future ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
Diffstat (limited to 'regex')
-rw-r--r--regex/reginit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/reginit.c b/regex/reginit.c
index 8347c4f6895..5980de24030 100644
--- a/regex/reginit.c
+++ b/regex/reginit.c
@@ -5,7 +5,7 @@
#include <m_string.h>
#include "cclass.h"
-static bool regex_inited=0;
+static my_bool regex_inited=0;
void my_regex_init(CHARSET_INFO *cs)
{