bk commit into 5.1 tree (guilhem:1.2532)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem.  When guilhem does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-19 18:45:11+01:00, guilhem@stripped +5 -0
  fixes for build failures due to my yesterday's changeset forbidding
  bool in C.

  client/get_password.c@stripped, 2008-02-19 18:45:06+01:00, guilhem@stripped +1 -1
    fix for build failure

  include/thr_alarm.h@stripped, 2008-02-19 18:45:06+01:00, guilhem@stripped +1 -1
    fix for build failure

  libmysql/dll.c@stripped, 2008-02-19 18:45:06+01:00, guilhem@stripped +1 -1
    fix for build failure

  libmysql/get_password.c@stripped, 2008-02-19 18:45:06+01:00, guilhem@stripped +1 -1
    fix for build failure

  mysys/thr_alarm.c@stripped, 2008-02-19 18:45:06+01:00, guilhem@stripped +1 -1
    fix for build failure

diff -Nrup a/client/get_password.c b/client/get_password.c
--- a/client/get_password.c	2006-12-23 20:19:43 +01:00
+++ b/client/get_password.c	2008-02-19 18:45:06 +01:00
@@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_m
 *  to will not include the eol characters.
 */
 
-static void get_password(char *to,uint length,int fd,bool echo)
+static void get_password(char *to,uint length,int fd, my_bool echo)
 {
   char *pos=to,*end=to+length;
 
diff -Nrup a/include/thr_alarm.h b/include/thr_alarm.h
--- a/include/thr_alarm.h	2007-03-29 22:58:47 +02:00
+++ b/include/thr_alarm.h	2008-02-19 18:45:06 +01:00
@@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed)
 void end_thr_alarm(my_bool free_structures);
 sig_handler process_alarm(int);
 #ifndef thr_got_alarm
-bool thr_got_alarm(thr_alarm_t *alrm);
+my_bool thr_got_alarm(thr_alarm_t *alrm);
 #endif
 
 
diff -Nrup a/libmysql/dll.c b/libmysql/dll.c
--- a/libmysql/dll.c	2006-04-16 03:17:24 +02:00
+++ b/libmysql/dll.c	2008-02-19 18:45:06 +01:00
@@ -25,7 +25,7 @@
 #include <my_sys.h>
 #include <my_pthread.h>
 
-static bool libmysql_inited=0;
+static my_bool libmysql_inited=0;
 
 void libmysql_init(void)
 {
diff -Nrup a/libmysql/get_password.c b/libmysql/get_password.c
--- a/libmysql/get_password.c	2006-05-18 16:57:43 +02:00
+++ b/libmysql/get_password.c	2008-02-19 18:45:06 +01:00
@@ -118,7 +118,7 @@ char *get_tty_password(const char *opt_m
   to will not include the eol characters.
 */
 
-static void get_password(char *to,uint length,int fd,bool echo)
+static void get_password(char *to,uint length,int fd, my_bool echo)
 {
   char *pos=to,*end=to+length;
 
diff -Nrup a/mysys/thr_alarm.c b/mysys/thr_alarm.c
--- a/mysys/thr_alarm.c	2007-08-13 15:11:10 +02:00
+++ b/mysys/thr_alarm.c	2008-02-19 18:45:06 +01:00
@@ -632,7 +632,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uin
 }
 
 
-bool thr_got_alarm(thr_alarm_t *alrm_ptr)
+my_bool thr_got_alarm(thr_alarm_t *alrm_ptr)
 {
   thr_alarm_t alrm= *alrm_ptr;
   MSG msg;