From 9e2b31b0268a05a94032ba96c0830536ce983685 Mon Sep 17 00:00:00 2001 From: "guilhem@gbichot4.local" <> Date: Mon, 18 Feb 2008 23:29:39 +0100 Subject: Fix for server bug experienced in Maria (wrong "Truncated incorrect 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). --- include/my_time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/my_time.h') diff --git a/include/my_time.h b/include/my_time.h index e3bdb58e5c2..af3fc103530 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -111,7 +111,7 @@ void init_time(void); TRUE The MYSQL_TIME value is definitely out of range */ -static inline bool validate_timestamp_range(const MYSQL_TIME *t) +static inline my_bool validate_timestamp_range(const MYSQL_TIME *t) { if ((t->year > TIMESTAMP_MAX_YEAR || t->year < TIMESTAMP_MIN_YEAR) || (t->year == TIMESTAMP_MAX_YEAR && (t->month > 1 || t->day > 19)) || -- cgit v1.2.1