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 /storage/heap | |
| 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 'storage/heap')
| -rw-r--r-- | storage/heap/hp_update.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/hp_update.c b/storage/heap/hp_update.c index 11dca974ad4..7f469af3c96 100644 --- a/storage/heap/hp_update.c +++ b/storage/heap/hp_update.c @@ -21,7 +21,7 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new) { HP_KEYDEF *keydef, *end, *p_lastinx; uchar *pos; - bool auto_key_changed= 0; + my_bool auto_key_changed= 0; HP_SHARE *share= info->s; DBUG_ENTER("heap_update"); |