Index: src/wp-admin/includes/schema.php
===================================================================
--- src/wp-admin/includes/schema.php	(revision 33728)
+++ src/wp-admin/includes/schema.php	(working copy)
@@ -135,11 +135,11 @@
 ) $charset_collate;
 CREATE TABLE $wpdb->options (
   option_id bigint(20) unsigned NOT NULL auto_increment,
-  option_name varchar(64) NOT NULL default '',
+  option_name varchar(255) NOT NULL default '',
   option_value longtext NOT NULL,
   autoload varchar(20) NOT NULL default 'yes',
   PRIMARY KEY  (option_id),
-  UNIQUE KEY option_name (option_name)
+  UNIQUE KEY option_name (option_name($max_index_length))
 ) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) unsigned NOT NULL auto_increment,
Index: src/wp-admin/includes/upgrade.php
===================================================================
--- src/wp-admin/includes/upgrade.php	(revision 33728)
+++ src/wp-admin/includes/upgrade.php	(working copy)
@@ -538,6 +538,9 @@
 	if ( $wp_current_db_version < 33056 )
 		upgrade_431();
 
+	if ( $wp_current_db_version < 33726 )
+		upgrade_440();
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -1596,6 +1599,25 @@
 }
 
 /**
+ * Executes changes made in WordPress 4.4.0.
+ *
+ * @since 4.4.0
+ *
+ * @global int  $wp_current_db_version Current version.
+ * @global wpdb $wpdb                  WordPress database abstraction object.
+ */
+function upgrade_440() {
+	global $wp_current_db_version, $wpdb;
+
+	if ( $wp_current_db_version < 33726 ) {
+
+		$wpdb->hide_errors();
+		$wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(255)" );
+		$wpdb->show_errors();
+	}
+}
+
+/**
  * Executes network-level upgrade routines.
  *
  * @since 3.0.0
@@ -2609,6 +2631,11 @@
 		$wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
 		$wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" );
 	}
+
+	// Upgrade versions prior to 4.4.
+	if ( $wp_current_db_version < 33726 ) {
+		$wpdb->query( "ALTER TABLE $wpdb->options DROP INDEX option_name, ADD INDEX option_name(option_name(191))" );
+	}
 }
 
 /**
Index: src/wp-includes/version.php
===================================================================
--- src/wp-includes/version.php	(revision 33728)
+++ src/wp-includes/version.php	(working copy)
@@ -11,7 +11,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 33056;
+$wp_db_version = 33726;
 
 /**
  * Holds the TinyMCE version