Commit d70aead7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-4.0 

into  mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Simple merge
parents 8bb396dc 90e41fac

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ scripts/mysqld_multi 
scripts/mysqld_safe

scripts/mysqldumpslow

scripts/mysqlhotcopy

scripts/mysqlhotcopy.sh.rej

scripts/safe_mysqld

select_test

sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
@@ -1052,4 +1053,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
scripts/mysqlhotcopy.sh.rej

include/thr_lock.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void thr_unlock(THR_LOCK_DATA *data); 
int thr_multi_lock(THR_LOCK_DATA **data,uint count);

void thr_multi_unlock(THR_LOCK_DATA **data,uint count);

void thr_abort_locks(THR_LOCK *lock);

bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

void thr_print_locks(void);		/* For debugging */

my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);

my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);

mysys/thr_lock.c

+2 −2
Original line number Diff line number Diff line
@@ -966,10 +966,10 @@ void thr_abort_locks(THR_LOCK *lock) 
  This is used to abort all locks for a specific thread

*/



bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)

my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)

{

  THR_LOCK_DATA *data;

  bool found= FALSE;

  my_bool found= FALSE;

  DBUG_ENTER("thr_abort_locks_for_thread");



  pthread_mutex_lock(&lock->mutex);

sql/lock.cc

+15 −5
Original line number Diff line number Diff line
@@ -335,7 +335,18 @@ void mysql_lock_abort(THD *thd, TABLE *table) 
}





/* Abort one thread / table combination */

/*

  Abort one thread / table combination



  SYNOPSIS

    mysql_lock_abort_for_thread()

    thd		Thread handler

    table	Table that should be removed from lock queue



  RETURN

    0  Table was not locked by another thread

    1  Table was locked by at least one other thread

*/



bool mysql_lock_abort_for_thread(THD *thd, TABLE *table)

{
@@ -348,10 +359,9 @@ bool mysql_lock_abort_for_thread(THD *thd, TABLE *table) 
  {

    for (uint i=0; i < locked->lock_count; i++)

    {

      bool found;

      found= thr_abort_locks_for_thread(locked->locks[i]->lock,

	         			 table->in_use->real_id);

      result|= found;

      if (thr_abort_locks_for_thread(locked->locks[i]->lock,

                                     table->in_use->real_id))

        result= TRUE;

    }

    my_free((gptr) locked,MYF(0));

  }

sql/mysql_priv.h

+3 −0
Original line number Diff line number Diff line
@@ -763,12 +763,15 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db, 
			    const char *table_name);

void remove_db_from_cache(const char *db);

void flush_tables();



/* bits for last argument to remove_table_from_cache() */

#define RTFC_NO_FLAG                0x0000

#define RTFC_OWNED_BY_THD_FLAG      0x0001

#define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002

#define RTFC_CHECK_KILLED_FLAG      0x0004

bool remove_table_from_cache(THD *thd, const char *db, const char *table,

                             uint flags);



bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables);

void copy_field_from_tmp_record(Field *field,int offset);

int fill_record(List<Item> &fields,List<Item> &values, bool ignore_errors);