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

1 files changed, 4 insertions, 4 deletions

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index e0cb771ee01..ddb0a4d3ed5 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -795,10 +795,10 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err)
 */
 
 longlong getopt_ll_limit_value(longlong num, const struct my_option *optp,
-                               bool *fix)
+                               my_bool *fix)
 {
   longlong old= num;
-  bool adjusted= FALSE;
+  my_bool adjusted= FALSE;
   char buf1[255], buf2[255];
   ulonglong block_size= (optp->block_size ? (ulonglong) optp->block_size : 1L);
 
@@ -864,9 +864,9 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err)
 
 
 ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
-                                 bool *fix)
+                                 my_bool *fix)
 {
-  bool adjusted= FALSE;
+  my_bool adjusted= FALSE;
   ulonglong old= num;
   char buf1[255], buf2[255];