Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca

into  gbichot4.local:/home/mysql_src/mysql-maria-monty


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_global.h:
  merge
storage/myisam/myisamdef.h:
  merge

9 files changed, 17 insertions, 17 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");
 
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index e45fe872d2d..99a8f932bc1 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -3368,7 +3368,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	}
 	if (b_type & BLOCK_DELETED)
 	{
-	  bool error=0;
+	  my_bool error=0;
 	  if (block_info.block_len+ (uint) (block_info.filepos-pos) <
 	      share->base.min_block_length)
 	  {
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index dbfc62b4fda..1a6314c88d9 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -430,7 +430,7 @@ static int _mi_find_writepos(MI_INFO *info,
   a big block.
 */
 
-static bool unlink_deleted_block(MI_INFO *info, MI_BLOCK_INFO *block_info)
+static my_bool unlink_deleted_block(MI_INFO *info, MI_BLOCK_INFO *block_info)
 {
   DBUG_ENTER("unlink_deleted_block");
   if (block_info->filepos == info->s->state.dellink)
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index b930877d26f..1af5e8c5585 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -1469,7 +1469,7 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key,
   uint key_length,ref_length,org_key_length=0,
        length_pack,new_key_length,diff_flag,pack_marker;
   uchar *start,*end,*key_end,*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;
diff --git a/storage/myisam/mi_update.c b/storage/myisam/mi_update.c
index dc6a1659931..b252892a96d 100644
--- a/storage/myisam/mi_update.c
+++ b/storage/myisam/mi_update.c
@@ -24,7 +24,7 @@ int mi_update(register MI_INFO *info, const uchar *oldrec, uchar *newrec)
   reg3 my_off_t pos;
   uint i;
   uchar old_key[HA_MAX_KEY_BUFF],*new_key;
-  bool auto_key_changed=0;
+  my_bool auto_key_changed=0;
   ulonglong changed;
   MYISAM_SHARE *share=info->s;
   ha_checksum old_checksum;
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c
index 05372ad12e8..0f2350ded12 100644
--- a/storage/myisam/mi_write.c
+++ b/storage/myisam/mi_write.c
@@ -102,9 +102,9 @@ int mi_write(MI_INFO *info, uchar *record)
   {
     if (mi_is_key_active(share->state.key_map, i))
     {
-      bool local_lock_tree= (lock_tree &&
-			     !(info->bulk_insert &&
-			       is_tree_inited(&info->bulk_insert[i])));
+      my_bool local_lock_tree= (lock_tree &&
+                                !(info->bulk_insert &&
+                                  is_tree_inited(&info->bulk_insert[i])));
       if (local_lock_tree)
       {
 	rw_wrlock(&share->key_root_lock[i]);
@@ -193,9 +193,9 @@ err:
     {
       if (mi_is_key_active(share->state.key_map, i))
       {
-	bool local_lock_tree= (lock_tree &&
-			       !(info->bulk_insert &&
-				 is_tree_inited(&info->bulk_insert[i])));
+	my_bool local_lock_tree= (lock_tree &&
+                                  !(info->bulk_insert &&
+                                    is_tree_inited(&info->bulk_insert[i])));
 	if (local_lock_tree)
 	  rw_wrlock(&share->key_root_lock[i]);
 	if (share->keyinfo[i].flag & HA_FULLTEXT)
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index 64c1a8214c3..b0b9226749d 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -432,7 +432,7 @@ typedef struct st_mi_s_param
     n_ref_length,
     n_length, totlength, part_of_prev_key, prev_length, pack_marker;
   uchar *key, *prev_key, *next_key_pos;
-  bool store_not_null;
+  my_bool store_not_null;
 } MI_KEY_PARAM;
 
 /* Prototypes for intern functions */
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index 04c0d9543d7..6e681676c12 100644
--- a/storage/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.c
@@ -35,7 +35,7 @@ struct file_info {
   char *name, *show_name;
   uchar *record;
   MI_INFO *isam;
-  bool closed,used;
+  my_bool closed, used;
   ulong accessed;
 };
 
@@ -67,7 +67,7 @@ static int close_some_file(TREE *tree);
 static int reopen_closed_file(TREE *tree,struct file_info *file_info);
 static int find_record_with_key(struct file_info *file_info,uchar *record);
 static void printf_log(const char *str,...);
-static bool cmp_filename(struct file_info *file_info,char * name);
+static my_bool cmp_filename(struct file_info *file_info,char * name);
 
 static uint verbose=0,update=0,test_info=0,max_files=0,re_open_count=0,
   recover=0,prefix_remove=0,opt_processes=0;
@@ -839,7 +839,7 @@ static void printf_log(const char *format,...)
 }
 
 
-static bool cmp_filename(struct file_info *file_info, char * name)
+static my_bool cmp_filename(struct file_info *file_info, char * name)
 {
   if (!file_info)
     return 1;
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 8deddcc9f1d..1c8e9e7f4dd 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -123,7 +123,7 @@ typedef struct st_isam_mrg {
 extern int main(int argc,char * *argv);
 static void get_options(int *argc,char ***argv);
 static MI_INFO *open_isam_file(char *name,int mode);
-static bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count);
+static my_bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count);
 static int compress(PACK_MRG_INFO *file,char *join_name);
 static HUFF_COUNTS *init_huff_count(MI_INFO *info,my_off_t records);
 static void free_counts_and_tree_and_queue(HUFF_TREE *huff_trees,
@@ -436,7 +436,7 @@ static MI_INFO *open_isam_file(char *name,int mode)
 }
 
 
-static bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count)
+static my_bool open_isam_files(PACK_MRG_INFO *mrg, char **names, uint count)
 {
   uint i,j;
   mrg->count=0;