Commit d2dc0a10 authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/jan/mysql-5.0


innobase/include/lock0lock.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents b9520662 c418ae98

innobase/include/lock0lock.h

+2 −0
Original line number Diff line number Diff line
@@ -612,6 +612,8 @@ extern lock_sys_t* lock_sys; 
#define LOCK_TABLE	16	/* these type values should be so high that */

#define	LOCK_REC	32	/* they can be ORed to the lock mode */

#define LOCK_TABLE_EXP	80	/* explicit table lock (80 = 16 + 64) */

#define	LOCK_TABLE_TRANSACTIONAL	144

				/* transactional table lock (144 = 16 + 128)*/

#define LOCK_TYPE_MASK	0xF0UL	/* mask used to extract lock type from the

				type_mode field in a lock */

/* Waiting lock flag */

innobase/include/trx0trx.h

+4 −0
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ struct trx_struct{ 
	ulint		n_lock_table_exp;/* number of explicit table locks

					(LOCK TABLES) reserved by the

					transaction, stored in trx_locks */

	ulint		n_lock_table_transactional;

					/* number of transactional table locks

					(LOCK TABLES..WHERE ENGINE) reserved by

					the transaction, stored in trx_locks */

	UT_LIST_NODE_T(trx_t)

			trx_list;	/* list of transactions */

	UT_LIST_NODE_T(trx_t)

innobase/lock/lock0lock.c

+27 −7
Original line number Diff line number Diff line
@@ -2207,7 +2207,8 @@ lock_grant( 
                release it at the end of the SQL statement */



                lock->trx->auto_inc_lock = lock;

        } else if (lock_get_type(lock) == LOCK_TABLE_EXP) {

        } else if (lock_get_type(lock) == LOCK_TABLE_EXP ||

			lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL) {

		ut_a(lock_get_mode(lock) == LOCK_S

			|| lock_get_mode(lock) == LOCK_X);

	}
@@ -3421,6 +3422,10 @@ lock_table_create( 
		lock->trx->n_lock_table_exp++;

	}



	if (lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL) {

		lock->trx->n_lock_table_transactional++;

	}



	lock->un_member.tab_lock.table = table;



	UT_LIST_ADD_LAST(un_member.tab_lock.locks, table->locks, lock);
@@ -3458,7 +3463,11 @@ lock_table_remove_low( 
	}



	if (lock_get_type(lock) == LOCK_TABLE_EXP) {

		lock->trx->n_lock_table_exp--;

		trx->n_lock_table_exp--;

	}



        if (lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL) {

		trx->n_lock_table_transactional--;

	}



	UT_LIST_REMOVE(trx_locks, trx->trx_locks, lock);
@@ -3592,7 +3601,8 @@ lock_table( 
				DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */

	ulint		flags,	/* in: if BTR_NO_LOCKING_FLAG bit is set,

				does nothing;

				if LOCK_TABLE_EXP bits are set,

				if LOCK_TABLE_EXP|LOCK_TABLE_TRANSACTIONAL

				bits are set,

				creates an explicit table lock */

	dict_table_t*	table,	/* in: database table in dictionary cache */

	ulint		mode,	/* in: lock mode */
@@ -3608,7 +3618,8 @@ lock_table( 
		return(DB_SUCCESS);

	}



	ut_a(flags == 0 || flags == LOCK_TABLE_EXP);

	ut_a(flags == 0 || flags == LOCK_TABLE_EXP || 

					flags == LOCK_TABLE_TRANSACTIONAL);



	trx = thr_get_trx(thr);
@@ -3722,7 +3733,8 @@ lock_table_dequeue( 
	ut_ad(mutex_own(&kernel_mutex));

#endif /* UNIV_SYNC_DEBUG */

	ut_a(lock_get_type(in_lock) == LOCK_TABLE ||

		lock_get_type(in_lock) == LOCK_TABLE_EXP);

		lock_get_type(in_lock) == LOCK_TABLE_EXP ||

		lock_get_type(in_lock) == LOCK_TABLE_TRANSACTIONAL);



	lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, in_lock);
@@ -3826,7 +3838,9 @@ lock_release_off_kernel( 
			}



			lock_table_dequeue(lock);

			if (lock_get_type(lock) == LOCK_TABLE_EXP) {



			if (lock_get_type(lock) == LOCK_TABLE_EXP ||

			    lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL) {

				ut_a(lock_get_mode(lock) == LOCK_S

					|| lock_get_mode(lock) == LOCK_X);

			}
@@ -3850,6 +3864,7 @@ lock_release_off_kernel( 


	ut_a(trx->auto_inc_lock == NULL);

	ut_a(trx->n_lock_table_exp == 0);

	ut_a(trx->n_lock_table_transactional == 0);

}



/*************************************************************************
@@ -3915,6 +3930,7 @@ lock_release_tables_off_kernel( 
	}



	ut_a(trx->n_lock_table_exp == 0);

	ut_a(trx->n_lock_table_transactional == 0);

}



/*************************************************************************
@@ -4028,11 +4044,15 @@ lock_table_print( 
	ut_ad(mutex_own(&kernel_mutex));

#endif /* UNIV_SYNC_DEBUG */

	ut_a(lock_get_type(lock) == LOCK_TABLE ||

		lock_get_type(lock) == LOCK_TABLE_EXP);

		lock_get_type(lock) == LOCK_TABLE_EXP ||

		lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL);



	if (lock_get_type(lock) == LOCK_TABLE_EXP) {

		fputs("EXPLICIT ", file);

	} else if (lock_get_type(lock) == LOCK_TABLE_TRANSACTIONAL) {

		fputs("TRANSACTIONAL ", file);

	}



	fputs("TABLE LOCK table ", file);

	ut_print_name(file, lock->trx, lock->un_member.tab_lock.table->name);

	fprintf(file, " trx id %lu %lu",

innobase/row/row0mysql.c

+9 −3
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ row_lock_table_for_mysql( 
					table handle */

	dict_table_t*	table,		/* in: table to lock, or NULL

					if prebuilt->table should be

					locked as LOCK_TABLE_EXP |

					locked or a

					prebuilt->select_lock_type */

	ulint		mode)		/* in: lock mode of table */

{
@@ -821,10 +821,16 @@ row_lock_table_for_mysql( 


	if (table) {

		err = lock_table(0, table, mode, thr);

	} else {

		if (mode == LOCK_TABLE_TRANSACTIONAL) {

			err = lock_table(LOCK_TABLE_TRANSACTIONAL, 

					prebuilt->table,

					prebuilt->select_lock_type, thr);

		} else {

			err = lock_table(LOCK_TABLE_EXP, prebuilt->table,

					prebuilt->select_lock_type, thr);

		}

	}



	trx->error_state = err;

innobase/trx/trx0roll.c

+5 −2
Original line number Diff line number Diff line
@@ -335,8 +335,10 @@ undo log. If the transaction was not yet committed, then we roll it back. 
Note: this is done in a background thread */



void *

trx_rollback_or_clean_all_without_sess(void *i)

/*========================================*/

trx_rollback_or_clean_all_without_sess(

/*===================================*/

			/* out: arguments */

	void	*i)	/* in: arguments (unused) */

{

	mem_heap_t*	heap;

	que_fork_t*	fork;
@@ -496,6 +498,7 @@ trx_rollback_or_clean_all_without_sess(void *i) 
	goto loop;



	os_thread_exit(i); /* not reached */

	return(i);

}

	

/***********************************************************************