Merge "rdbms: rename CONN_TRX_AUTO constant to CONN_TRX_AUTOCOMMIT"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)
diff --cc includes/libs/rdbms/loadbalancer/ILoadBalancer.php
Simple merge
diff --cc includes/libs/rdbms/loadbalancer/LoadBalancer.php
Simple merge
diff --cc tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 12 Apr 2018 20:38:58 +0000 (20:38 +0000)
		1	2
includes/libs/rdbms/loadbalancer/ILoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/libs/rdbms/loadbalancer/LoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php	patch \|	diff1 \|	diff2 \|	blob \| history