diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index 1a4fd364df..de4d2de9c6 100644
--- a/phpBB/phpbb/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
@@ -207,7 +207,26 @@ class mysql extends \phpbb\db\driver\mysql_base
 	*/
 	function sql_affectedrows()
 	{
-		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
+		if ($this->db_connect_id)
+		{
+			// We always want the number of matched rows
+			// instead of changed rows, when running an update.
+			// So when mysql_info() returns the number of matched rows
+			// we return that one instead of mysql_affected_rows()
+			$mysql_info = @mysql_info($this->db_connect_id);
+			if ($mysql_info !== false)
+			{
+				$match = array();
+				preg_match('#^Rows matched: (\d)+  Changed: (\d)+  Warnings: (\d)+$#', $mysql_info, $match);
+				if (isset($match[1]))
+				{
+					return $match[1];
+				}
+			}
+
+			return @mysql_affected_rows($this->db_connect_id);
+		}
+		return false;
 	}
 
 	/**
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 6814599b24..39df175860 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -57,7 +57,8 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			}
 		}
 
-		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket);
+		$this->db_connect_id = mysqli_init();
+		@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS);
 
 		if ($this->db_connect_id && $this->dbname != '')
 		{
diff --git a/tests/config/db_text_test.php b/tests/config/db_text_test.php
index 354c0efacf..59730edf09 100644
--- a/tests/config/db_text_test.php
+++ b/tests/config/db_text_test.php
@@ -9,8 +9,8 @@
 
 class phpbb_config_db_text_test extends phpbb_database_test_case
 {
-	private $db;
-	private $config_text;
+	/** @var \phpbb\config\db_text */
+	protected $config_text;
 
 	public function getDataSet()
 	{
@@ -48,6 +48,12 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
 		$this->assertSame('24', $this->config_text->get('foo'));
 	}
 
+	public function test_set_same_value_get()
+	{
+		$this->config_text->set('foo', '23');
+		$this->assertSame('23', $this->config_text->get('foo'));
+	}
+
 	public function test_set_get_long_string()
 	{
 		$expected = str_repeat('ABC', 10000);
@@ -89,6 +95,8 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
 			'baby' => 'phpBB',
 			// Entry update
 			'bar' => '64',
+			// Entry update - same value
+			'foo' => '23',
 		);
 
 		$this->config_text->set_array($set_array_param);
diff --git a/tests/dbal/sql_affected_rows_test.php b/tests/dbal/sql_affected_rows_test.php
new file mode 100644
index 0000000000..860b8bf237
--- /dev/null
+++ b/tests/dbal/sql_affected_rows_test.php
@@ -0,0 +1,64 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_sql_affected_rows_test extends phpbb_database_test_case
+{
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->db = $this->new_dbal();
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	public function test_update()
+	{
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = 'bertie'";
+		$this->db->sql_query($sql);
+
+		$this->assertEquals(2, $this->db->sql_affectedrows());
+	}
+
+	public function test_update_all_matched_unequal_updated()
+	{
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = 'foo'";
+		$this->db->sql_query($sql);
+
+		$this->assertEquals(2, $this->db->sql_affectedrows());
+	}
+
+	public function test_update_same_value_matched_unequal_updated()
+	{
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = 'foo'
+			WHERE config_value = 'foo'";
+		$this->db->sql_query($sql);
+
+		$this->assertEquals(1, $this->db->sql_affectedrows());
+	}
+
+	public function test_insert()
+	{
+		$sql = 'INSERT INTO ' . CONFIG_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+			'config_name'	=> 'bertie',
+			'config_value'	=> 'rules',
+		));
+		$this->db->sql_query($sql);
+
+		$this->assertEquals(1, $this->db->sql_affectedrows());
+	}
+}