Index: modules/field/modules/field_sql_storage/field_sql_storage.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/field_sql_storage/field_sql_storage.module,v
retrieving revision 1.32
diff -u -r1.32 field_sql_storage.module
--- modules/field/modules/field_sql_storage/field_sql_storage.module	13 Nov 2009 19:19:50 -0000	1.32
+++ modules/field/modules/field_sql_storage/field_sql_storage.module	3 Dec 2009 23:49:57 -0000
@@ -38,7 +38,12 @@
  *   A string containing the generated name for the database table
  */
 function _field_sql_storage_tablename($field) {
-  return "field_data_{$field['field_name']}" . ($field['deleted'] ? "_{$field['id']}" : '');
+  if ($field['deleted']) {
+    return "field_deleted_data_{$field['id']}";
+  }
+  else {
+    return "field_data_{$field['field_name']}";
+  }
 }
 
 /**
@@ -50,7 +55,12 @@
  *   A string containing the generated name for the database table
  */
 function _field_sql_storage_revision_tablename($field) {
-  return "field_revision_{$field['field_name']}" . ($field['deleted'] ? "_{$field['id']}" : '');
+  if ($field['deleted']) {
+    return "field_deleted_revision_{$field['id']}";
+  }
+  else {
+    return "field_revision_{$field['field_name']}";
+  }
 }
 
 /**