summaryrefslogtreecommitdiff
path: root/include/my_time.h
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 /include/my_time.h
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 'include/my_time.h')
-rw-r--r--include/my_time.h2
1 files changed, 1 insertions, 1 deletions
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)) ||