Commit 70a4cf9d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 49206d2d 9bb865be

include/config-win.h

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ inline double ulonglong2double(ulonglong value) 
#define SHAREDIR		"share"

#define DEFAULT_CHARSET_HOME	"C:/mysql/"

#endif

#ifndef DEFAULT_HOME_ENV

#define DEFAULT_HOME_ENV MYSQL_HOME

#endif



/* File name handling */

innobase/include/ut0ut.h

+8 −0
Original line number Diff line number Diff line
@@ -139,6 +139,14 @@ ib_time_t 
ut_time(void);

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

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

Returns system time. */



void

ut_usectime(

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

	ulint*	sec,	/* out: seconds since the Epoch */

	ulint*	ms);	/* out: microseconds since the Epoch+*sec */

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

Returns the difference of two times in seconds. */



double

innobase/mtr/mtr0log.c

+2 −1
Original line number Diff line number Diff line
@@ -443,7 +443,8 @@ mlog_open_and_write_index( 
			type = dict_col_get_type(dict_field_get_col(field));

			len = field->fixed_len;

			ut_ad(len < 0x7fff);

			if (len == 0 && dtype_get_len(type) > 255) {

			if (len == 0 && (dtype_get_len(type) > 255

				|| dtype_get_mtype(type) == DATA_BLOB)) {

				/* variable-length field

				with maximum length > 255 */

				len = 0x7fff;

innobase/srv/srv0srv.c

+26 −28
Original line number Diff line number Diff line
@@ -1384,7 +1384,8 @@ srv_suspend_mysql_thread( 
	trx_t*		trx;

	ibool		had_dict_lock			= FALSE;

	ibool		was_declared_inside_innodb	= FALSE;

  ib_longlong   start_time, finish_time;

	ib_longlong	start_time			= 0;

	ib_longlong	finish_time;

	ulint		diff_time;

	ulint		sec;

	ulint		ms;
@@ -1430,14 +1431,13 @@ srv_suspend_mysql_thread( 
	os_event_reset(event);	



	slot->suspend_time = ut_time();

  if (thr->lock_state == QUE_THR_LOCK_ROW)

  {



	if (thr->lock_state == QUE_THR_LOCK_ROW) {

		srv_n_lock_wait_count++;

		srv_n_lock_wait_current_count++;



		ut_usectime(&sec, &ms);

		start_time = (ib_longlong)sec * 1000000 + ms;



	}

	/* Wake the lock timeout monitor thread, if it is suspended */
@@ -1490,8 +1490,7 @@ srv_suspend_mysql_thread( 


	wait_time = ut_difftime(ut_time(), slot->suspend_time);



  if (thr->lock_state == QUE_THR_LOCK_ROW)

  {

	if (thr->lock_state == QUE_THR_LOCK_ROW) {

		ut_usectime(&sec, &ms);

		finish_time = (ib_longlong)sec * 1000000 + ms;
@@ -1499,8 +1498,7 @@ srv_suspend_mysql_thread( 
  

		srv_n_lock_wait_current_count--;

		srv_n_lock_wait_time = srv_n_lock_wait_time + diff_time;

      if (diff_time > srv_n_lock_max_wait_time)

      {

		if (diff_time > srv_n_lock_max_wait_time) {

			srv_n_lock_max_wait_time = diff_time;

		}

	}

innobase/sync/sync0sync.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ mutex_spin_wait( 
{

  ulint    index; /* index of the reserved wait cell */

  ulint    i;     /* spin round count */

  ib_longlong lstart_time, lfinish_time; /* for timing os_wait */

  ib_longlong lstart_time = 0, lfinish_time; /* for timing os_wait */

  ulint ltime_diff;

  ulint sec;

  ulint ms;