diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 2244f34329..34df5d4358 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -45,7 +45,7 @@ CREATE TABLE $wpdb->comments (
   comment_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
   comment_content text NOT NULL,
   comment_karma int(11) NOT NULL default '0',
-  comment_approved enum('0','1','spam') NOT NULL default '1',
+  comment_approved varchar(20) NOT NULL default '1',
   comment_agent varchar(255) NOT NULL default '',
   comment_type varchar(20) NOT NULL default '',
   comment_parent bigint(20) NOT NULL default '0',
@@ -63,7 +63,7 @@ CREATE TABLE $wpdb->links (
   link_target varchar(25) NOT NULL default '',
   link_category bigint(20) NOT NULL default '0',
   link_description varchar(255) NOT NULL default '',
-  link_visible enum('Y','N') NOT NULL default 'Y',
+  link_visible varchar(20) NOT NULL default 'Y',
   link_owner int(11) NOT NULL default '1',
   link_rating int(11) NOT NULL default '0',
   link_updated datetime NOT NULL default '0000-00-00 00:00:00',
@@ -79,7 +79,7 @@ CREATE TABLE $wpdb->options (
   blog_id int(11) NOT NULL default '0',
   option_name varchar(64) NOT NULL default '',
   option_value longtext NOT NULL,
-  autoload enum('yes','no') NOT NULL default 'yes',
+  autoload varchar(20) NOT NULL default 'yes',
   PRIMARY KEY  (option_id,blog_id,option_name),
   KEY option_name (option_name)
 ) $charset_collate;
@@ -101,9 +101,9 @@ CREATE TABLE $wpdb->posts (
   post_title text NOT NULL,
   post_category int(4) NOT NULL default '0',
   post_excerpt text NOT NULL,
-  post_status enum('publish','draft','private','static','object','attachment','inherit','future', 'pending') NOT NULL default 'publish',
-  comment_status enum('open','closed','registered_only') NOT NULL default 'open',
-  ping_status enum('open','closed') NOT NULL default 'open',
+  post_status varchar(20) NOT NULL default 'publish',
+  comment_status varchar(20) NOT NULL default 'open',
+  ping_status varchar(20) NOT NULL default 'open',
   post_password varchar(20) NOT NULL default '',
   post_name varchar(200) NOT NULL default '',
   to_ping text NOT NULL,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6d981caf42..6de97bf6ec 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,6 +16,6 @@ $wp_version = '2.4-bleeding';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 6730;
+$wp_db_version = 6731;
 
 ?>
\ No newline at end of file