Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build

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


client/mysqltest.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged

1 files changed, 1 insertions, 1 deletions

diff --git a/extra/replace.c b/extra/replace.c
index 9d1d8335014..9b7695eddcb 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -67,7 +67,7 @@ typedef struct st_replace {
 } REPLACE;
 
 typedef struct st_replace_found {
-  bool found;
+  my_bool found;
   char *replace_string;
   uint to_offset;
   int from_offset;