Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 91be72ce780aafc9121114644fd78294769a5fe7..147f4a5f7972ae3d7d48ae2247f54955f6a89fa9 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //$path_to_root="..";
-
+define('MAX_DEADLOCK_RETRY', 3);
 
 if (function_exists('mysqli_connect'))
        include_once("connect_db_mysqli.inc");
@@ -90,7 +90,7 @@ function get_mysql_collation($lang=null)
                'it' => 'roman',
        );
 
-       return 'utf8_'.(isset($db_collation[$lang]) ? $db_collation[$lang] : 'general').'_ci';
+       return 'utf8_'.(isset($db_collation[$lang]) ? $db_collation[$lang] : 'unicode').'_ci';
 }
 
 /*
@@ -116,4 +116,12 @@ function db_get_default_charset()
        return $var[0];
 }
 
-       
+/*
+       SQL db profiling stub
+*/
+if (!function_exists('db_profile'))
+{
+       function db_profile($sql=false)
+       {
+       }
+}
\ No newline at end of file