Backup and Restore: system settings has not been refreshed after restore (typo).

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 98a18f59824085e7ca0f20366132549271904720..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';
 }
 
 /*