Commit c4c2c7bc authored by unknown's avatar unknown
Browse files

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

into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents ee4c9104 af22d870

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ ulli@morbus.(none) 
venu@hundin.mysql.fi

venu@myvenu.com

venu@work.mysql.com

vtkachenko@intelp4d.mysql.com

vva@eagle.mysql.r18.ru

vva@genie.(none)

vva@mysql.r18.ru

innobase/include/que0que.h

+6 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ struct que_thr_struct{ 
					the control came */

	ulint		resource;	/* resource usage of the query thread

					thus far */

  ulint   lock_state;	/* lock state of thread (table or row) */

};



#define QUE_THR_MAGIC_N		8476583
@@ -482,6 +483,11 @@ struct que_fork_struct{ 
#define QUE_THR_SUSPENDED	7

#define QUE_THR_ERROR		8



/* Query thread lock states */

#define QUE_THR_LOCK_NOLOCK     0

#define QUE_THR_LOCK_ROW        1

#define QUE_THR_LOCK_TABLE      2



/* From where the cursor position is counted */

#define QUE_CUR_NOT_DEFINED	1

#define QUE_CUR_START		2

innobase/include/srv0srv.h

+5 −0
Original line number Diff line number Diff line
@@ -525,6 +525,11 @@ struct export_var_struct{ 
        ulint innodb_pages_created;

        ulint innodb_pages_read;

        ulint innodb_pages_written;

        ulint innodb_row_lock_waits;

        ulint innodb_row_lock_current_waits;

        ib_longlong innodb_row_lock_time;

        ulint innodb_row_lock_time_avg;

        ulint innodb_row_lock_time_max;

        ulint innodb_rows_read;

        ulint innodb_rows_inserted;

        ulint innodb_rows_updated;

innobase/include/sync0rw.h

+5 −3
Original line number Diff line number Diff line
@@ -61,8 +61,9 @@ Creates, or rather, initializes an rw-lock object in a specified memory 
location (which must be appropriately aligned). The rw-lock is initialized

to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free

is necessary only if the memory block containing it is freed. */

#define rw_lock_create(L) rw_lock_create_func(\

            (L), __FILE__, __LINE__, __STRING(L))

          

#define rw_lock_create(L)	rw_lock_create_func((L), __FILE__, __LINE__)

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

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

Creates, or rather, initializes an rw-lock object in a specified memory
@@ -75,7 +76,8 @@ rw_lock_create_func( 
/*================*/

	rw_lock_t*	lock,		/* in: pointer to memory */

	const char*	cfile_name,	/* in: file name where created */

	ulint		cline);		/* in: file line where created */

  ulint cline,  /* in: file line where created */

  const char* cmutex_name); /* in: mutex name */

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

Calling this function is obligatory only if the memory buffer containing

the rw-lock is freed. Removes an rw-lock object from the global list. The

innobase/include/sync0sync.h

+21 −3
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Created 9/5/1995 Heikki Tuuri 
#include "os0sync.h"

#include "sync0arr.h"



extern my_bool  timed_mutexes;



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

Initializes the synchronization data structures. */
@@ -35,8 +37,7 @@ location (which must be appropriately aligned). The mutex is initialized 
in the reset state. Explicit freeing of the mutex with mutex_free is

necessary only if the memory block containing it is freed. */





#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__)

#define mutex_create(M)	mutex_create_func((M), __FILE__, __LINE__, __STRING(M))

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

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

Creates, or rather, initializes a mutex object in a specified memory
@@ -49,7 +50,8 @@ mutex_create_func( 
/*==============*/

	mutex_t*	mutex,		/* in: pointer to memory */

	const char*	cfile_name,	/* in: file name where created */

	ulint		cline);		/* in: file line where created */

  ulint cline,  /* in: file line where created */

  const char* cmutex_name); /* in: mutex name */

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

Calling this function is obligatory only if the memory buffer containing

the mutex is freed. Removes a mutex object from the mutex list. The mutex
@@ -471,6 +473,15 @@ struct mutex_struct { 
	const char*	cfile_name;/* File name where mutex created */

	ulint	cline;		/* Line where created */

	ulint	magic_n;

  ulong count_using; /* count of times mutex used */

  ulong count_spin_loop; /* count of spin loops */

  ulong count_spin_rounds; /* count of spin rounds */

  ulong count_os_wait; /* count of os_wait */

  ulong count_os_yield; /* count of os_wait */

  ulonglong lspent_time; /* mutex os_wait timer msec */

  ulonglong lmax_spent_time; /* mutex os_wait timer msec */

  const char* cmutex_name;/* mutex name  */

  ulint mutex_type;/* 0 - usual mutex 1 - rw_lock mutex  */

};



#define MUTEX_MAGIC_N	(ulint)979585
@@ -504,6 +515,13 @@ extern ibool sync_order_checks_on; 
/* This variable is set to TRUE when sync_init is called */

extern ibool	sync_initialized;



/* Global list of database mutexes (not OS mutexes) created. */

UT_LIST_BASE_NODE_T(mutex_t)  mutex_list;



/* Mutex protecting the mutex_list variable */

mutex_t mutex_list_mutex;





#ifndef UNIV_NONINL

#include "sync0sync.ic"

#endif