- Patch #219334 by Goba et al: prevent the upload table being created if it already exists.

modules/upload/upload.install

@@ -5,8 +5,12 @@
  * Implementation of hook_install().
  */
 function upload_install() {
-  // Create tables.
-  drupal_install_schema('upload');
+  // Create table. The upload table might have been created in the Drupal 5
+  // to Drupal 6 upgrade, and was migrated from the file_revisions table. So
+  // in this case, there is no need to create the table, it is already there.
+  if (!db_table_exists('upload')) {
+    drupal_install_schema('upload');
+  }
 }
 
 /**