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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/client_priv.h:
  Manual merge with main 5.1 source.
sql/event_data_objects.cc:
  Manual merge with main 5.1 source.
sql/event_db_repository.cc:
  Manual merge with main 5.1 source.
sql/mysqld.cc:
  Manual merge with main 5.1 source.
sql/sql_load.cc:
  Manual merge with main 5.1 source.
sql/sql_parse.cc:
  Manual merge with main 5.1 source.

1 files changed, 10 insertions, 10 deletions

diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 3d2a5b277fe..56ac7c1a88d 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -286,7 +286,7 @@ int
 Event_parse_data::init_execute_at(THD *thd)
 {
   my_bool not_used;
-  TIME ltime;
+  MYSQL_TIME ltime;
   my_time_t ltime_utc;
 
   DBUG_ENTER("Event_parse_data::init_execute_at");
@@ -455,7 +455,7 @@ int
 Event_parse_data::init_starts(THD *thd)
 {
   my_bool not_used;
-  TIME ltime;
+  MYSQL_TIME ltime;
   my_time_t ltime_utc;
 
   DBUG_ENTER("Event_parse_data::init_starts");
@@ -509,7 +509,7 @@ int
 Event_parse_data::init_ends(THD *thd)
 {
   my_bool not_used;
-  TIME ltime;
+  MYSQL_TIME ltime;
   my_time_t ltime_utc;
 
   DBUG_ENTER("Event_parse_data::init_ends");
@@ -941,7 +941,7 @@ int
 Event_queue_element::load_from_row(THD *thd, TABLE *table)
 {
   char *ptr;
-  TIME time;
+  MYSQL_TIME time;
   LEX_STRING tz_name;
 
   DBUG_ENTER("Event_queue_element::load_from_row");
@@ -1136,7 +1136,7 @@ error:
 */
 static
 my_time_t
-add_interval(TIME *ltime, const Time_zone *time_zone,
+add_interval(MYSQL_TIME *ltime, const Time_zone *time_zone,
              interval_type scale, INTERVAL interval)
 {
   if (date_add_interval(ltime, scale, interval))
@@ -1229,8 +1229,8 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
   }
   DBUG_PRINT("info", ("seconds: %ld  months: %ld", (long) seconds, (long) months));
 
-  TIME local_start;
-  TIME local_now;
+  MYSQL_TIME local_start;
+  MYSQL_TIME local_now;
 
   /* Convert times from UTC to local. */
   {
@@ -1473,7 +1473,7 @@ Event_queue_element::compute_next_execution_time()
   {
     /*
       Both starts and m_ends are set and time_now is between them (incl.)
-      If last_executed is set then increase with m_expression. The new TIME is
+      If last_executed is set then increase with m_expression. The new MYSQL_TIME is
       after m_ends set execute_at to 0. And check for on_completion
       If not set then schedule for now.
     */
@@ -1615,7 +1615,7 @@ err:
 
 
 /*
-  Set the internal last_executed TIME struct to now. NOW is the
+  Set the internal last_executed MYSQL_TIME struct to now. NOW is the
   time according to thd->query_start(), so the THD's clock.
 
   SYNOPSIS
@@ -1686,7 +1686,7 @@ append_datetime(String *buf, Time_zone *time_zone, my_time_t secs,
     Pass the buffer and the second param tells fills the buffer and
     returns the number of chars to copy.
   */
-  TIME time;
+  MYSQL_TIME time;
   time_zone->gmt_sec_to_TIME(&time, secs);
   buf->append(dtime_buff, my_datetime_to_str(&time, dtime_buff));
   buf->append(STRING_WITH_LEN("'"));