Commit e6b215bf authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1 


sql/ha_innodb.cc:
  Auto merged
parents f8df1290 e72ec933

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ innobase_init(void) 
				"innobase_buffer_pool_size can't be over 4GB"

				" on 32-bit systems");



			DBUG_RETURN(0);

			goto error;

		}



		if (innobase_log_file_size > UINT_MAX32) {
@@ -1242,7 +1242,7 @@ innobase_init(void) 
				"innobase_log_file_size can't be over 4GB"

				" on 32-bit systems");



			DBUG_RETURN(0);

			goto error;

		}

	}