Commit 1f8ad81e authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23

parents ff99f3d2 dd4d4cc8

sql/slave.cc

+26 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "slave.h"

#include <thr_alarm.h>

#include <my_dir.h>

#include <assert.h>



#define RPL_LOG_NAME (glob_mi.log_file_name[0] ? glob_mi.log_file_name :\

 "FIRST")
@@ -362,6 +363,7 @@ static int create_table_from_dump(THD* thd, NET* net, const char* db, 
  TABLE_LIST tables;

  int error= 1;

  handler *file;

  char *query;

  

  if (packet_len == packet_error)

  {
@@ -375,15 +377,23 @@ static int create_table_from_dump(THD* thd, NET* net, const char* db, 
    return 1;

  }

  thd->command = COM_TABLE_DUMP;

  thd->query = sql_alloc(packet_len + 1);

  if (!thd->query)

  /* Note that we should not set thd->query until the area is initalized */

  if (!(query = sql_alloc(packet_len + 1)))

  {

    sql_print_error("create_table_from_dump: out of memory");

    net_printf(&thd->net, ER_GET_ERRNO, "Out of memory");

    return 1;

  }

  memcpy(thd->query, net->read_pos, packet_len);

  thd->query[packet_len] = 0;

  memcpy(query, net->read_pos, packet_len);

  query[packet_len]= 0;

  thd->query_length= packet_len;

  /*

    We make the following lock in an attempt to ensure that the compiler will

    not rearrange the code so that thd->query is set too soon

  */

  VOID(pthread_mutex_lock(&LOCK_thread_count));

  thd->query= query;

  VOID(pthread_mutex_unlock(&LOCK_thread_count));

  thd->current_tablenr = 0;

  thd->query_error = 0;

  thd->net.no_send_ok = 1;
@@ -967,10 +977,11 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      thd->db = rewrite_db((char*)qev->db);

      if (db_ok(thd->db, replicate_do_db, replicate_ignore_db))

      {

	thd->query = (char*)qev->query;

	thd->query_length= q_len;

	thd->set_time((time_t)qev->when);

	thd->current_tablenr = 0;

	VOID(pthread_mutex_lock(&LOCK_thread_count));

	thd->query = (char*)qev->query;

	thd->query_id = query_id++;

	VOID(pthread_mutex_unlock(&LOCK_thread_count));

	thd->last_nx_table = thd->last_nx_db = 0;
@@ -1008,7 +1019,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	else

	{

	  // master could be inconsistent, abort and tell DBA to check/fix it

	  VOID(pthread_mutex_lock(&LOCK_thread_count));

	  thd->db = thd->query = 0;

	  VOID(pthread_mutex_unlock(&LOCK_thread_count));

	  thd->convert_set = 0;

	  close_thread_tables(thd);

	  free_root(&thd->mem_root,0);
@@ -1017,7 +1030,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	}

      }

      thd->db = 0;				// prevent db from being freed

      VOID(pthread_mutex_lock(&LOCK_thread_count));

      thd->query = 0;				// just to be sure

      VOID(pthread_mutex_unlock(&LOCK_thread_count));

      // assume no convert for next query unless set explictly

      thd->convert_set = 0;

      close_thread_tables(thd);
@@ -1059,6 +1074,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      Load_log_event* lev = (Load_log_event*)ev;

      init_sql_alloc(&thd->mem_root, 8192,0);

      thd->db = rewrite_db((char*)lev->db);

      DBUG_ASSERT(thd->query == 0);

      thd->query = 0;

      thd->query_error = 0;
@@ -1490,7 +1506,9 @@ the slave thread with \"mysqladmin start-slave\". We stopped at log \ 
  sql_print_error("Slave thread exiting, replication stopped in log '%s' at \

position %s",

		  RPL_LOG_NAME, llstr(glob_mi.pos,llbuff));

  VOID(pthread_mutex_lock(&LOCK_thread_count));

  thd->query = thd->db = 0; // extra safety

  VOID(pthread_mutex_unlock(&LOCK_thread_count));

  if (mysql)

    mc_mysql_close(mysql);

  thd->proc_info = "Waiting for slave mutex on exit";

sql/sql_db.cc

+6 −4
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ void mysql_create_db(THD *thd, char *db, uint create_options) 
  }

  if (!thd->query)

  {

    thd->query = path;

    thd->query_length = (uint) (strxmov(path,"create database ", db, NullS)-

				path);

    thd->query = path;

  }

  {

    mysql_update_log.write(thd,thd->query, thd->query_length);
@@ -103,8 +103,9 @@ void mysql_create_db(THD *thd, char *db, uint create_options) 
  }

  if (thd->query == path)

  {

    VOID(pthread_mutex_lock(&LOCK_thread_count));

    thd->query = 0; // just in case

    thd->query_length = 0;

    VOID(pthread_mutex_unlock(&LOCK_thread_count));

  }

  send_ok(&thd->net, result);
@@ -178,9 +179,9 @@ void mysql_rm_db(THD *thd,char *db,bool if_exists) 


    if (!thd->query)

    {

      thd->query = path;

      thd->query_length = (uint) (strxmov(path,"drop database ", db, NullS)-

				  path);

      thd->query = path;

    }

    mysql_update_log.write(thd, thd->query, thd->query_length);

    if (mysql_bin_log.is_open())
@@ -190,8 +191,9 @@ void mysql_rm_db(THD *thd,char *db,bool if_exists) 
    }

    if (thd->query == path)

    {

      VOID(pthread_mutex_lock(&LOCK_thread_count));

      thd->query = 0; // just in case

      thd->query_length = 0;

      VOID(pthread_mutex_unlock(&LOCK_thread_count));

    }

    send_ok(&thd->net,(ulong) deleted);

  }

sql/sql_parse.cc

+8 −9
Original line number Diff line number Diff line
@@ -778,7 +778,6 @@ bool do_command(THD *thd) 
      tbl_name[tbl_len] = 0;

      if (mysql_table_dump(thd, db, tbl_name, -1))

	send_error(&thd->net); // dump to NET



      break;

    }

  case COM_CHANGE_USER: