Merge remote-tracking branch 'upstream/develop' into develop-db-driver

1 files changed, 16 insertions, 0 deletions

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 744bb3cd7..0fe3dfc7e 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1346,6 +1346,22 @@ class CI_DB_driver {
 
 		return $item.$alias;
 	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Dummy method that allows Active Record class to be disabled
+	 *
+	 * This function is used extensively by every db driver.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	protected function _reset_select()
+	{
+	
+	}
+
 }
 
 /* End of file DB_driver.php */