Merge bk-internal.mysql.com:/home/bk/mysql-5.0 (6b584127) · Commits · Software / OSDI20 Artifacts / mariadb

config/ac-macros/ha_ndbcluster.m4

+23 −18

Original line number	Diff line number	Diff line
		@@ -36,11 +36,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
		;;
		esac

		AC_ARG_WITH([ndb-shm],
		[
		--with-ndb-shm Include the NDB Cluster shared memory transporter],
		[ndb_shm="$withval"],
		[ndb_shm=no])
		AC_ARG_WITH([ndb-test],
		[
		--with-ndb-test Include the NDB Cluster ndbapi test programs],
		@@ -61,23 +56,15 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
		--with-ndb-port-base Base port for NDB Cluster transporters],
		[ndb_port_base="$withval"],
		[ndb_port_base="default"])
		AC_ARG_WITH([ndb-debug],
		[
		--without-ndb-debug Disable special ndb debug features],
		[ndb_debug="$withval"],
		[ndb_debug="default"])

		AC_MSG_CHECKING([for NDB Cluster options])
		AC_MSG_RESULT([])

		have_ndb_shm=no
		case "$ndb_shm" in
		yes )
		AC_MSG_RESULT([-- including shared memory transporter])
		AC_DEFINE([NDB_SHM_TRANSPORTER], [1],
		[Including Ndb Cluster DB shared memory transporter])
		have_ndb_shm="yes"
		;;
		* )
		AC_MSG_RESULT([-- not including shared memory transporter])
		;;
		esac

		have_ndb_test=no
		case "$ndb_test" in
		yes )
		@@ -100,6 +87,24 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
		;;
		esac

		case "$ndb_debug" in
		yes )
		AC_MSG_RESULT([-- including ndb extra debug options])
		have_ndb_debug="yes"
		;;
		full )
		AC_MSG_RESULT([-- including ndb extra extra debug options])
		have_ndb_debug="full"
		;;
		no )
		AC_MSG_RESULT([-- not including ndb extra debug options])
		have_ndb_debug="no"
		;;
		* )
		have_ndb_debug="default"
		;;
		esac

		AC_MSG_RESULT([done.])
		])

+2 −2

Original line number	Diff line number	Diff line
		@@ -340,8 +340,8 @@ typedef struct st_mi_check_param
		ha_checksum key_crc[MI_MAX_POSSIBLE_KEY];
		ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY];
		void *thd;
		char db_name,table_name;
		char *op_name;
		const char db_name, table_name;
		const char *op_name;
		} MI_CHECK;

		typedef struct st_sort_ft_buf

+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

+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;

+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;
		}
		}