Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
include/m_string.h:
  Auto merged
include/mysql_com.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_init.c:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/strtod.c:
  Auto merged
vio/vio_priv.h:
  Auto merged
vio/viosocket.c:
  Auto merged
client/mysqltest.c:
  SCCS merged
include/my_global.h:
  SCCS merged
sql/field.h:
  SCCS merged
sql/sql_table.cc:
  Manual merge
strings/ctype-bin.c:
  Manual merge

1 files changed, 11 insertions, 7 deletions

diff --git a/win/README b/win/README
index 1e45b92abb2..fbcdfd068b8 100644
--- a/win/README
+++ b/win/README
@@ -35,7 +35,7 @@ the link named "Complete package, excluding sources".  This includes an
 installer that will install bison.  After the installer finishes, modify
 your path so that you can execute bison.
 
-(Alternative you, can take the sql_yacc.yy and sql_yacc.h files from a
+(As an alternative you can take the sql_yacc.yy and sql_yacc.h files from a
 matching mysql tar distribution and drop them into the sql directory just
 before you start the build)
 
@@ -45,8 +45,11 @@ Clone your bk tree to any location you like.
 
 Step 5
 ------
-From the root of your bk clone, execute the command:  win\configure <options>.  
-The options right now are
+From the root of your installation directory, execute the command:
+
+win\configure <options>
+
+The options right now are:
 
     WITH_INNOBASE_STORAGE_ENGINE         Enable particular storage engines
     WITH_PARTITION_STORAGE_ENGINE
@@ -68,8 +71,9 @@ win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_S
 
 Step 6
 ------
-From the root of your bk clone, execute one of the batch files to generate the type
-of project files you desire.
+
+From the root of your installation directory/bk clone, execute one of
+the batch files to generate the type of project files you desire.
 
 For Visual Studio 8 (or Visual C++ 2005 express edition), do win\build-vs8.
 For Visual Studio 7.1, do win\build-vs71.
@@ -80,8 +84,8 @@ Step 7
 ------
 From the root of your bk clone, start your build.
 
-For Visual Studio, simply execute mysql.sln.  This will start the IDE and you can
-click the build solution menu option.
+For Visual Studio, execute mysql.sln.  This will start the IDE
+and you can click the build solution menu option.
 
 Current issues
 --------------