Send create table and alter table sql to the proper db creation code.

Fixed mysql_error() checking.


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@246 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 6 insertions, 4 deletions

diff --git a/wp-inst/wp-includes/wp-db.php b/wp-inst/wp-includes/wp-db.php
index 38125de..810cc11 100644
--- a/wp-inst/wp-includes/wp-db.php
+++ b/wp-inst/wp-includes/wp-db.php
@@ -140,7 +140,7 @@ class wpdb {
 			$action = 'global';
 			$details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
 			$this->db_global = $details;
-		} elseif ( preg_match("/^\\s*(insert|delete|update|replace) /i",$query) ) {
+		} elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i",$query) ) {
 			$action = 'write';
 			$details = $db_list[ 'write' ][ mt_rand( 0, count( $db_list[ 'write' ] ) -1 ) ];
 			$this->db_write = $details;
@@ -217,9 +217,11 @@ class wpdb {
 			$this->queries[] = array( $query, $this->timer_stop() );
 
 		// If there is an error then take note of it..
-		if ( mysql_error() ) {
-			$this->print_error();
-			return false;
+		if( $dbh ) {
+			if ( mysql_error( $dbh ) ) {
+				$this->print_error( mysql_error( $dbh ));
+				return false;
+			}
 		}
 
 		if ( preg_match("/^\\s*(insert|delete|update|replace) /i",$query) ) {