From 7a452519e721e59e919b84ed6e27f3f9fdf94dfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 6 May 2014 22:00:54 +0200 Subject: [PATCH] Try to fix [ bug #1363 ] Unable to update from 3.5.1 to 3.5.2 --- htdocs/core/db/mysql.class.php | 5 +++-- htdocs/core/db/mysqli.class.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index 923f04f992a..227a70a020f 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -257,7 +257,7 @@ class DoliDBMysql extends DoliDB { return explode('.',$this->getVersion()); } - + /** * Return version of database client driver * @@ -267,7 +267,7 @@ class DoliDBMysql extends DoliDB { return mysqli_get_client_info(); } - + /** * Close database connexion @@ -651,6 +651,7 @@ class DoliDBMysql extends DoliDB 1006 => 'DB_ERROR_CANNOT_CREATE', 1007 => 'DB_ERROR_ALREADY_EXISTS', 1008 => 'DB_ERROR_CANNOT_DROP', + 1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS', 1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP', 1044 => 'DB_ERROR_ACCESSDENIED', 1046 => 'DB_ERROR_NODBSELECTED', diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 2ed4c74bb17..c2400a43b7e 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -262,7 +262,7 @@ class DoliDBMysqli extends DoliDB { return mysqli_get_client_info($this->db); } - + /** * Close database connexion @@ -650,6 +650,7 @@ class DoliDBMysqli extends DoliDB 1006 => 'DB_ERROR_CANNOT_CREATE', 1007 => 'DB_ERROR_ALREADY_EXISTS', 1008 => 'DB_ERROR_CANNOT_DROP', + 1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS', 1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP', 1044 => 'DB_ERROR_ACCESSDENIED', 1046 => 'DB_ERROR_NODBSELECTED',