Merge "database: Small DB class cleanups"

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

Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)
diff --cc includes/db/Database.php
Simple merge
diff --cc includes/db/DatabaseMysql.php
Simple merge
diff --cc includes/db/DatabaseMysqlBase.php
Simple merge
diff --cc includes/db/DatabaseMysqli.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 28 Jun 2015 00:26:07 +0000 (00:26 +0000)
		1	2
includes/db/Database.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/DatabaseMysql.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/DatabaseMysqlBase.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/DatabaseMysqli.php	patch \|	diff1 \|	diff2 \|	blob \| history