Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint (8f21b31d) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_autodiscover.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ create table t1 (a int primary key) engine=ndb;
		select * from t1;
		a
		select * from t1;
		ERROR HY000: Can't lock file (errno: 4009)
		ERROR HY000: Can't lock file (errno: 157)
		use test;
		drop database test_only_ndb_tables;
		CREATE TABLE t9 (

mysql-test/t/ndb_autodiscover3.test

+9 −3

Original line number	Diff line number	Diff line
		-- source include/have_ndb.inc
		-- source include/have_multi_ndb.inc
		-- source include/ndb_default_cluster.inc
		-- source include/not_embedded.inc


		@@ -7,6 +8,11 @@
		drop table if exists t1, t2;
		--enable_warnings

		# Workaround for Bug#27644
		# ndb: connecting api node/mysqld may "steal" node_id from running mysqld
		# - let ndb_waiter use a fixed node id so "steal" cannot happen
		--let connect_str = "nodeid=6;$NDB_CONNECTSTRING"

		#
		# Transaction ongoing while cluster is restarted
		#
		@@ -17,7 +23,7 @@ begin;
		insert into t1 values (1);

		--exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

		--error 1297
		insert into t1 values (2);
		@@ -35,7 +41,7 @@ insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,
		select * from t2 order by a limit 3;

		--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

		--connection server2
		create table t2 (a int key) engine=ndbcluster;
		@@ -49,7 +55,7 @@ select * from t2 order by a limit 3;
		select * from t2 order by a limit 3;

		--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

		--connection server1
		show tables;

ndb/src/common/transporter/TCP_Transporter.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@ TCP_Transporter::initTransporter() {

		void
		TCP_Transporter::setSocketOptions(){
		int sockOptKeepAlive = 1;

		if (setsockopt(theSocket, SOL_SOCKET, SO_RCVBUF,
		(char*)&sockOptRcvBufSize, sizeof(sockOptRcvBufSize)) < 0) {
		#ifdef DEBUG_TRANSPORTER
		@@ -169,6 +171,11 @@ TCP_Transporter::setSocketOptions(){
		#endif
		}//if

		if (setsockopt(theSocket, SOL_SOCKET, SO_KEEPALIVE,
		(char*)&sockOptKeepAlive, sizeof(sockOptKeepAlive)) < 0) {
		ndbout_c("The setsockopt SO_KEEPALIVE error code = %d", InetErrno);
		}//if

		//-----------------------------------------------
		// Set the TCP_NODELAY option so also small packets are sent
		// as soon as possible

ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -452,6 +452,13 @@ Uint32 Dbtup::leafPageRangeFull(Fragrecord* const regFragPtr, PageRangePtr curr
		ptrCheckGuard(parentPageRangePtr, cnoOfPageRangeRec, pageRange);
		if (parentPageRangePtr.p->currentIndexPos < 3) {
		ljam();

		if (c_noOfFreePageRanges < tiprNoLevels)
		{
		ljam();
		return RNIL;
		}//if

		/* ---------------------------------------------------------------- */
		/* WE HAVE FOUND AN EMPTY ENTRY IN A PAGE RANGE RECORD. */
		/* ALLOCATE A NEW PAGE RANGE RECORD, FILL IN THE START RANGE, */

ndb/src/mgmclient/CommandInterpreter.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -2026,6 +2026,9 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
		return -1;
		}

		if (!nostart)
		ndbout_c("Shutting down nodes with \"-n, no start\" option, to subsequently start the nodes.");

		result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,
		initialstart, nostart, abort, &need_disconnect);