summaryrefslogtreecommitdiff
path: root/vio/viosslfactories.c
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 /vio/viosslfactories.c
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 'vio/viosslfactories.c')
-rw-r--r--vio/viosslfactories.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index d7e4f380bc1..9ffe600beb8 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -17,8 +17,8 @@
#ifdef HAVE_OPENSSL
-static bool ssl_algorithms_added = FALSE;
-static bool ssl_error_strings_loaded= FALSE;
+static my_bool ssl_algorithms_added = FALSE;
+static my_bool ssl_error_strings_loaded= FALSE;
static int verify_depth = 0;
static unsigned char dh512_p[]=