Commit 854ad0ab authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/my/mysql-5.0
parents c58a2bf7 2f2d0b60

mysql-test/my_manage.c

+10 −13
Original line number Diff line number Diff line
@@ -231,9 +231,6 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
{

  arg_list_t al;

  int err= 0;

#ifndef __WIN__

  int i;

#endif

  char trash[FN_REFLEN];



  /* mysqladmin file */
@@ -247,16 +244,11 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
  add_arg(&al, "--user=%s", user);

  add_arg(&al, "--password=%s", password);

  add_arg(&al, "--silent");

  add_arg(&al, "--host=localhost");



/* #ifdef NOT_USED */

#ifndef __NETWARE__

  add_arg(&al, "-O");

  add_arg(&al, "connect_timeout=10");

  add_arg(&al, "--connect_timeout=10");

  add_arg(&al, "-w");

#endif



  add_arg(&al, "--host=localhost");

#ifndef __NETWARE__

  add_arg(&al, "--protocol=tcp");

#endif

  add_arg(&al, "ping");
@@ -266,9 +258,14 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
    -- we will try the ping multiple times

  */

#ifndef __WIN__

  for (i= 0; (i < TRY_MAX)

         && (err= spawn(mysqladmin_file, &al, TRUE, NULL,

                        trash, NULL, NULL)); i++) sleep(1);

  {

    int i;

    for (i= 0;

         (i < TRY_MAX) && (err= spawn(mysqladmin_file, &al, TRUE, NULL,

                                      trash, NULL, NULL));

         i++)

      sleep(1);

  }

#else

  err= spawn(mysqladmin_file, &al, TRUE, NULL,trash, NULL, NULL);

#endif

mysql-test/r/drop_temp_table.result

+1 −0
Original line number Diff line number Diff line 
drop database if exists `drop-temp+table-test`;

reset master;

create database `drop-temp+table-test`;

use `drop-temp+table-test`;

mysql-test/t/drop_temp_table.test

+4 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support binlog

-- source include/not_embedded.inc



--disable_warnings

drop database if exists `drop-temp+table-test`;

--enable_warnings



connect (con1,localhost,root,,);

connect (con2,localhost,root,,);

connection con1;

sql/log.cc

+4 −4
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ MYSQL_LOG::MYSQL_LOG() 
  :bytes_written(0), last_time(0), query_start(0), name(0),

   file_id(1), open_count(1), log_type(LOG_CLOSED), write_error(0), inited(0),

   need_start_event(1), prepared_xids(0), description_event_for_exec(0),

   description_event_for_queue(0), readers_count(0), reset_pending(false)

   description_event_for_queue(0), readers_count(0), reset_pending(FALSE)

{

  /*

    We don't want to initialize LOCK_Log here as such initialization depends on
@@ -965,7 +965,7 @@ bool MYSQL_LOG::reset_logs(THD* thd) 
    goto err;

  }



  reset_pending= true;

  reset_pending= TRUE;

  /* 

    send update signal just in case so that all reader threads waiting

    for log update will leave wait condition
@@ -975,7 +975,7 @@ bool MYSQL_LOG::reset_logs(THD* thd) 
    if there are active readers wait until all of them will 

    release opened files 

  */

  if (readers_count)

  while (readers_count)

    pthread_cond_wait(&reset_cond, &LOCK_log);



  for (;;)
@@ -996,7 +996,7 @@ bool MYSQL_LOG::reset_logs(THD* thd) 
  my_free((gptr) save_name, MYF(0));



err:

  reset_pending= false;

  reset_pending= FALSE;



  (void) pthread_mutex_unlock(&LOCK_thread_count);

  pthread_mutex_unlock(&LOCK_readers);

sql/log_event.h

+2 −3
Original line number Diff line number Diff line
@@ -430,11 +430,10 @@ enum Log_event_type 


  /*

    Add new events here - right above this comment!

    And change the ENUM_END_EVENT_MARKER below.

    Existing events should never change their numbers

    Existing events (except ENUM_END_EVENT) should never change their numbers

  */



  ENUM_END_EVENT= 19 /* end marker */

  ENUM_END_EVENT /* end marker */

};



/*