diff options
| author | guilhem@gbichot4.local <> | 2008-02-18 23:29:39 +0100 |
|---|---|---|
| committer | guilhem@gbichot4.local <> | 2008-02-18 23:29:39 +0100 |
| commit | 9e2b31b0268a05a94032ba96c0830536ce983685 (patch) | |
| tree | 7bffd7a5bcb1eea8fb0183e3a4e3a40cf6a783a6 /include/my_sys.h | |
| parent | ccd53222d61d25ae2702d87a3b617a1f835eedc7 (diff) | |
| download | mariadb-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_sys.h')
| -rw-r--r-- | include/my_sys.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index ee79806c40e..57711b7ae82 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -919,12 +919,12 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); -extern bool resolve_charset(const char *cs_name, - CHARSET_INFO *default_cs, - CHARSET_INFO **cs); -extern bool resolve_collation(const char *cl_name, - CHARSET_INFO *default_cl, - CHARSET_INFO **cl); +extern my_bool resolve_charset(const char *cs_name, + CHARSET_INFO *default_cs, + CHARSET_INFO **cs); +extern my_bool resolve_collation(const char *cl_name, + CHARSET_INFO *default_cl, + CHARSET_INFO **cl); extern void free_charsets(void); extern char *get_charsets_dir(char *buf); |