Merge remote-tracking branch 'origin/3.3' into develop

htdocs/install/upgrade.php

@@ -181,6 +181,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
     if ($ok)
     {
 	    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
+	    if ($result)	// result defined for version 3.2 or -
+	    {
 		    $obj = $db->fetch_object($result);
 		    if ($obj)	// It table categorie_association exists
 		    {
@@ -251,6 +253,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			    }
 		    }
 	    }
+    }
 
 	/*
 	 * Remove deprecated indexes and constraints for Mysql