Merge branch 'refs/heads/develop' into update/changelog

Conflicts:
	user_guide_src/source/changelog.rst
	user_guide_src/source/installation/downloads.rst
	user_guide_src/source/installation/upgrade_214.rst

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php
index 7e0030e15..968476dea 100644
--- a/tests/mocks/database/db.php
+++ b/tests/mocks/database/db.php
@@ -106,6 +106,7 @@ class Mock_Database_DB {
 		$subdriver = self::$subdriver;
 		$case->ci_vfs_create(array(
 			'DB_driver.php' => '',
+			'DB_result.php' => '',
 			'DB_forge.php' => '',
 			'DB_query_builder.php' => ''
 		), '', $case->ci_base_root, 'database');
@@ -113,6 +114,7 @@ class Mock_Database_DB {
 		{
 			$case->ci_vfs_create(array(
 				$driver.'_driver.php' => '',
+				$driver.'_result.php' => '',
 				$driver.'_forge.php' => ''
 			), '', $case->ci_base_root, 'database/drivers/'.$driver);
 		}