Merge zim.(none):/home/brian/mysql/dep-5.1

into  zim.(none):/home/brian/mysql/remove-bdb-5.1


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/backup.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/federated_transactions.test:
  Merge

1 files changed, 1 insertions, 1 deletions

diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 8efe09a45be..b4cfe041529 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -429,7 +429,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
     goto err;
   }
 
-  if (check_date(l_time, not_zero_date, flags, was_cut))
+  if ((my_bool)check_date(l_time, not_zero_date, flags, was_cut))
     goto err;
 
   l_time->time_type= (number_of_fields <= 3 ?