bk commit into 5.1 tree (hartmut:1.2341) BUG#23748

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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, 2006-10-30 18:35:51+01:00, hartmut@stripped +3 -0
  time_t related format string fixes by casting to long (Bug #23748)

  sql/event_queue.cc@stripped, 2006-10-30 18:35:47+01:00, hartmut@stripped +4 -4
    time_t related format string fixes by casting to long (Bug #23748)

  sql/event_scheduler.cc@stripped, 2006-10-30 18:35:47+01:00, hartmut@stripped +2 -2
    time_t related format string fixes by casting to long (Bug #23748)

  sql/table.cc@stripped, 2006-10-30 18:35:47+01:00, hartmut@stripped +1 -1
    time_t related format string fixes by casting to long (Bug #23748)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1-maint

--- 1.250/sql/table.cc	2006-10-30 18:36:01 +01:00
+++ 1.251/sql/table.cc	2006-10-30 18:36:01 +01:00
@@ -2407,7 +2407,7 @@
   my_bool fields_diff_count;
   DBUG_ENTER("table_check_intact");
   DBUG_PRINT("info",("table=%s expected_count=%d",table->alias, table_f_count));
-  DBUG_PRINT("info",("last_create_time=%d", *last_create_time));
+  DBUG_PRINT("info",("last_create_time=%ld", (long)*last_create_time));
   
   if ((fields_diff_count= (table->s->fields != table_f_count)) ||
       (*last_create_time != table->file->stats.create_time))

--- 1.20/sql/event_queue.cc	2006-10-30 18:36:01 +01:00
+++ 1.21/sql/event_queue.cc	2006-10-30 18:36:01 +01:00
@@ -665,12 +665,12 @@
     et= ((Event_queue_element*)queue_element(&queue, i));
     DBUG_PRINT("info",("et=%p db=%s name=%s",et, et->dbname.str, et->name.str));
     DBUG_PRINT("info", ("exec_at=%llu starts=%llu ends=%llu execs_so_far=%u"
-               " expr=%lld et.exec_at=%d now=%d (et.exec_at - now)=%d if=%d",
+               " expr=%lld et.exec_at=%ld now=%ld (et.exec_at - now)=%d if=%d",
                TIME_to_ulonglong_datetime(&et->execute_at),
                TIME_to_ulonglong_datetime(&et->starts),
                TIME_to_ulonglong_datetime(&et->ends),
                et->execution_count,
-               et->expression, sec_since_epoch_TIME(&et->execute_at), now,
+               et->expression, (long)sec_since_epoch_TIME(&et->execute_at), (long)now,
                (int)(sec_since_epoch_TIME(&et->execute_at) - now),
                sec_since_epoch_TIME(&et->execute_at) <= now));
   }
@@ -812,8 +812,8 @@
   if (to_free)
     delete top;
 
-  DBUG_PRINT("info", ("returning %d. et_new=%p abstime.tv_sec=%d ",
-             ret, *job_data, abstime? abstime->tv_sec:0));
+  DBUG_PRINT("info", ("returning %d. et_new=%p abstime.tv_sec=%ld ",
+             ret, *job_data, (long)(abstime? abstime->tv_sec:0)));
 
   if (*job_data)
     DBUG_PRINT("info", ("db=%s  name=%s definer=%s", (*job_data)->dbname.str,

--- 1.30/sql/event_scheduler.cc	2006-10-30 18:36:01 +01:00
+++ 1.31/sql/event_scheduler.cc	2006-10-30 18:36:01 +01:00
@@ -264,8 +264,8 @@
 
   if (!post_init_event_thread(thd))
   {
-    DBUG_PRINT("info", ("Baikonur, time is %d, BURAN reporting and operational."
-               "THD=%p", time(NULL), thd));
+    DBUG_PRINT("info", ("Baikonur, time is %ld, BURAN reporting and operational."
+						"THD=%p", (long)time(NULL), thd));
 
     sql_print_information("SCHEDULER: [%s.%s of %s] executing in thread %lu. "
                           "Execution %u",