Commit 09e07ceb authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
parents 83587008 2940168f

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.57)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.10-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.11-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=10

NDB_VERSION_BUILD=11

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/thr_lock.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data, 
                                         uint count, THR_LOCK_OWNER *owner);

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

void thr_abort_locks(THR_LOCK *lock);

void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

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

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

*/



void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)

bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)

{

  THR_LOCK_DATA *data;

  bool found= FALSE;

  DBUG_ENTER("thr_abort_locks_for_thread");



  pthread_mutex_lock(&lock->mutex);
@@ -1061,6 +1062,7 @@ void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread) 
      DBUG_PRINT("info",("Aborting read-wait lock"));

      data->type= TL_UNLOCK;			/* Mark killed */

      /* It's safe to signal the cond first: we're still holding the mutex. */

      found= TRUE;

      pthread_cond_signal(data->cond);

      data->cond= 0;				/* Removed from list */
@@ -1076,6 +1078,7 @@ void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread) 
    {

      DBUG_PRINT("info",("Aborting write-wait lock"));

      data->type= TL_UNLOCK;

      found= TRUE;

      pthread_cond_signal(data->cond);

      data->cond= 0;
@@ -1086,7 +1089,7 @@ void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread) 
    }

  }

  pthread_mutex_unlock(&lock->mutex);

  DBUG_VOID_RETURN;

  DBUG_RETURN(found);

}

sql/examples/ha_archive.cc

+13 −10
Original line number Diff line number Diff line
@@ -140,16 +140,19 @@ static handlerton archive_hton = { 
  "archive",

  0,       /* slot */

  0,       /* savepoint size. */

  0,       /* close_connection */

  0,       /* savepoint */

  0,       /* rollback to savepoint */

  0,       /* releas savepoint */

  0,       /* commit */

  0,       /* rollback */

  0,       /* prepare */

  0,       /* recover */

  0,       /* commit_by_xid */

  0,       /* rollback_by_xid */

  NULL,    /* close_connection */

  NULL,    /* savepoint */

  NULL,    /* rollback to savepoint */

  NULL,    /* releas savepoint */

  NULL,    /* commit */

  NULL,    /* rollback */

  NULL,    /* prepare */

  NULL,    /* recover */

  NULL,    /* commit_by_xid */

  NULL,    /* rollback_by_xid */

  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

};

sql/examples/ha_example.cc

+13 −10
Original line number Diff line number Diff line
@@ -77,16 +77,19 @@ static handlerton example_hton= { 
  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

  0,       /* close_connection */

  0,       /* savepoint */

  0,       /* rollback to savepoint */

  0,       /* release savepoint */

  0,       /* commit */

  0,       /* rollback */

  0,       /* prepare */

  0,       /* recover */

  0,       /* commit_by_xid */

  0,       /* rollback_by_xid */

  NULL,    /* close_connection */

  NULL,    /* savepoint */

  NULL,    /* rollback to savepoint */

  NULL,    /* release savepoint */

  NULL,    /* commit */

  NULL,    /* rollback */

  NULL,    /* prepare */

  NULL,    /* recover */

  NULL,    /* commit_by_xid */

  NULL,    /* rollback_by_xid */

  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

};