Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 2063)
+++ wp-includes/functions.php	(working copy)
@@ -333,7 +333,9 @@
 	if ( isset( $notoptions[$setting] ) )
 		return $default;
 
-	$alloptions = wp_load_alloptions();
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		$alloptions = wp_load_alloptions();
+	}
 
 	if ( isset( $alloptions[$setting] ) ) {
 		$value = $alloptions[$setting];
@@ -527,12 +529,14 @@
 	$newvalue = maybe_serialize( $newvalue );
 
 	do_action( 'update_option', $option_name, $oldvalue, $newvalue );
-	$alloptions = wp_load_alloptions();
-	if ( isset( $alloptions[$option_name] ) ) {
-		$alloptions[$option_name] = $newvalue;
-		wp_cache_set( 'alloptions', $alloptions, 'options' );
-	} else {
-		wp_cache_set( $option_name, $newvalue, 'options' );
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		$alloptions = wp_load_alloptions();
+		if ( isset( $alloptions[$option_name] ) ) {
+			$alloptions[$option_name] = $newvalue;
+			wp_cache_set( 'alloptions', $alloptions, 'options' );
+		} else {
+			wp_cache_set( $option_name, $newvalue, 'options' );
+		}
 	}
 
 	$wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) );
@@ -589,12 +593,14 @@
 	$value = maybe_serialize( $value );
 	$autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
 	do_action( 'add_option', $name, $value );
-	if ( 'yes' == $autoload ) {
-		$alloptions = wp_load_alloptions();
-		$alloptions[$name] = $value;
-		wp_cache_set( 'alloptions', $alloptions, 'options' );
-	} else {
-		wp_cache_set( $name, $value, 'options' );
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		if ( 'yes' == $autoload ) {
+			$alloptions = wp_load_alloptions();
+			$alloptions[$name] = $value;
+			wp_cache_set( 'alloptions', $alloptions, 'options' );
+		} else {
+			wp_cache_set( $name, $value, 'options' );
+		}
 	}
 
 	// This option exists now
@@ -635,14 +641,16 @@
 	do_action( 'delete_option', $name );
 	// expected_slashed ($name)
 	$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
-	if ( 'yes' == $option->autoload ) {
-		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$name] ) ) {
-			unset( $alloptions[$name] );
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		if ( 'yes' == $option->autoload ) {
+			$alloptions = wp_load_alloptions();
+			if ( isset( $alloptions[$name] ) ) {
+				unset( $alloptions[$name] );
+				wp_cache_set( 'alloptions', $alloptions, 'options' );
+			}
+		} else {
+			wp_cache_delete( $name, 'options' );
 		}
-	} else {
-		wp_cache_delete( $name, 'options' );
 	}
 	do_action( 'deleted_option', $name );
 	return true;
@@ -694,15 +702,17 @@
 	if ( $_wp_using_ext_object_cache ) {
 		$value = wp_cache_get($transient, 'transient');
 	} else {
-		$transient_option = '_transient_' . esc_sql($transient);
-		// If option is not in alloptions, it is not autoloaded and thus has a timeout
-		$alloptions = wp_load_alloptions();
-		if ( !isset( $alloptions[$transient_option] ) ) {
-			$transient_timeout = '_transient_timeout_' . esc_sql($transient);
-			if ( get_option($transient_timeout) < time() ) {
-				delete_option($transient_option);
-				delete_option($transient_timeout);
-				return false;
+		if ( ! defined( 'WP_INSTALLING' ) ) {
+			$transient_option = '_transient_' . esc_sql($transient);
+			// If option is not in alloptions, it is not autoloaded and thus has a timeout
+			$alloptions = wp_load_alloptions();
+			if ( !isset( $alloptions[$transient_option] ) ) {
+				$transient_timeout = '_transient_timeout_' . esc_sql($transient);
+				if ( get_option($transient_timeout) < time() ) {
+					delete_option($transient_option);
+					delete_option($transient_timeout);
+					return false;
+				}
 			}
 		}
 
@@ -1750,7 +1760,9 @@
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
-	$alloptions = wp_load_alloptions();
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		$alloptions = wp_load_alloptions();
+	}
 	// If siteurl is not set to autoload, check it specifically
 	if ( !isset( $alloptions['siteurl'] ) )
 		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );