Commit 5872e5ae authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/space/pekka/ndb/version/my51
parents 7e1ea97a 53462e3b

sql/event_executor.cc

+9 −2
Original line number Diff line number Diff line
@@ -184,6 +184,13 @@ event_executor_main(void *arg) 
  // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff

  my_thread_init();



  if (sizeof(my_time_t) != sizeof(time_t))

  {

    sql_print_error("sizeof(my_time_t) != sizeof(time_t) ."

                    "The scheduler will not work correctly. Stopping.");

    goto err_no_thd;

  }

  

  //TODO Andrey: Check for NULL

  if (!(thd = new THD)) // note that contructor of THD uses DBUG_ !

  {
@@ -275,7 +282,7 @@ event_executor_main(void *arg) 
      }

        

      DBUG_PRINT("evex main thread",("computing time to sleep till next exec"));

      time(&now);

      time((time_t *)&now);

      my_tz_UTC->gmt_sec_to_TIME(&time_now, now);

      t2sleep= evex_time_diff(&et->execute_at, &time_now);

      VOID(pthread_mutex_unlock(&LOCK_event_arrays));

sql/event_timed.cc

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ event_timed::compute_next_execution_time() 
    }

    goto ret;

  }

  time(&now);

  time((time_t *)&now);

  my_tz_UTC->gmt_sec_to_TIME(&time_now, now);

/*

  sql_print_information("[%s.%s]", dbname.str, name.str);
@@ -703,7 +703,7 @@ event_timed::mark_last_executed() 
  TIME time_now;

  my_time_t now;



  time(&now);

  time((time_t *)&now);

  my_tz_UTC->gmt_sec_to_TIME(&time_now, now);



  last_executed= time_now; // was execute_at