Merge from 5.1-build of the "my_bool for C" changeset.

Removing "#define bool BOOL" as it's dangerous.


include/config-win.h:
  This #define was confusing: a) it changes the semantics of bool but
  only on Windows (C++ standard says that casting int to bool to int
  yields 0 or 1, but if using BOOL (which is int) this breaks, see
  old BUG 11567 "Variable 'foreign_key_checks', and other variables,
  differs binlog tests") b) it is not needed in C++ which has a bool type
  c) it is not needed in C where we must use my_bool as bool either does
  not exist or changes size between C and C++.
storage/maria/ma_check.c:
  my_bool for C
storage/maria/ma_dynrec.c:
  my_bool for C
storage/maria/ma_search.c:
  my_bool for C
storage/maria/ma_write.c:
  my_bool for C
storage/maria/maria_def.h:
  my_bool for C
storage/maria/maria_pack.c:
  my_bool for C

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
index f6c75ce8eed..0ceafbf4d04 100644
--- a/storage/maria/ma_search.c
+++ b/storage/maria/ma_search.c
@@ -1564,7 +1564,7 @@ _ma_calc_var_pack_key_length(MARIA_KEYDEF *keyinfo, uint nod_flag,
        length_pack,new_key_length,diff_flag,pack_marker;
   const uchar *start,*end,*key_end;
   uchar *sort_order;
-  bool same_length;
+  my_bool same_length;
 
   length_pack=s_temp->ref_length=s_temp->n_ref_length=s_temp->n_length=0;
   same_length=0; keyseg=keyinfo->seg;