Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

INSTALL-WIN-SOURCE

@@ -10,7 +10,7 @@ This is a simple 'HOWTO' document describing how to
 build MySQL binaries for versions 4.1 and above on
 Windows. Instructions are provided for building binaries
 from a standard source distribution or from the BitKeeper
-tree that contains the latest developer source.
+tree that contains the latest development source.
 
 ---------------------------------------------------------
 NOTE
@@ -51,29 +51,15 @@ system:
    - ~45 MB disk space
    - 64 MB RAM
 
-You'll also need a MySQL source distribution.  You can
+You'll also need a MySQL source distribution, which you
-get the source for released versions of MySQL from:
+can obtain as described in section 2.
-
-http://www.mysql.com/downloads/
-
-Alternatively, you can package a source distribution
-yourself from the latest BitKeeper developer source
-tree. If you plan to do this, you must create the
-package on a Unix system and then transfer it to your
-Windows system.  (The reason for this is that the initial
-configuration scripts and some of the build steps work
-only on Unix.)  The BitKeeper approach thus requires:
-
-   - A system running Unix, or a Unix-like system such as Linux
-   - BitKeeper 3.0 installed on that system (you can obtain
-     BitKeeper from http://www.bitkeeper.com)
 
 -------------------------------------------------------
 2. OBTAINING A WINDOWS SOURCE DISTRIBUTION
 -------------------------------------------------------
 
-There are two ways you can get a Windows source distribution for 
+There are two ways you can get a Windows source distribution
-MySQL version 4.1 and above:
+for MySQL version 4.1 and above:
 
  I.  Obtain a MySQL AB-distributed source distribution for the
      particular version of MySQL in which you are interested.
@@ -82,41 +68,54 @@ MySQL version 4.1 and above:
      
      http://www.mysql.com/downloads/
 
- II. Create a source package yourself from the latest development 
+ II. Alternatively, you can package a source distribution
-     'BitKeeper' source tree.
+     yourself from the latest BitKeeper developer source
+     tree. If you plan to do this, you must create the
+     package on a Unix system and then transfer it to your
+     Windows system.  (The reason for this is that some of the
+     configuration and build steps require tools that work only
+     on Unix.)  The BitKeeper approach thus requires:
+
+     - A system running Unix, or a Unix-like system such as Linux
+     - BitKeeper 3.0 installed on that system (you can obtain
+       BitKeeper from http://www.bitkeeper.com)
 
 If you are using the first option, you can skip the  next
-section and go directly to 'BUILDING FROM VC++ WORKSPACE'.
+section and go directly to "BUILDING 'mysql server & clients'
+FROM VC++ WORKSPACE"
 
 -------------------------------------------------------
 3. CREATING A SOURCE PACKAGE FROM THE 'BitKeeper' TREE
 -------------------------------------------------------
 
-To build the latest Windows source package, Please follow the 
+To build the latest Windows source package from the current
-following instructions from any of your '*UNIX*' operating 
+BitKeeper source tree, use the following instructions. Please
-systems (preferably Linux):
+note that this procedure must be performed on a system
+running a Unix or Unix-like operating system.  (The procedure
+is know to work well on Linux, for example.
 
 - Clone the BitKeeper source tree for MySQL (version 4.1
   or above, as desired).  For more information how to clone
-  the BitKeeper source tree, follow the instructions at:
+  the source tree, see the instructions at:
 
   http://www.mysql.com/doc/en/Installing_source_tree.html
 
-- Build the distribution so that you have a server binary to
+- Configure and build the distribution so that you have a
-  work with.  One way to do this is to run the following
+  server binary to work with.  One way to do this is to run
-  command in the top-level directory of your source tree:
+  the following command in the top-level directory of your
+  source tree:
 
   ./BUILD/compile-pentium-max
 
-- After making sure that  build process completed successfully,
+- After making sure that the build process completed successfully,
   run the following utility script from top-level directory
   of your source tree:
 
   ./scripts/make_win_src_distribution
 
-  This script creates the Windows source package.  You can
+  This script creates a Windows source package, to be used on
-  supply different options to the script based on your needs.
+  your Windows system.  You can supply different options to the
-  It accepts: the following options:
+  script based on your needs. It accepts the following options:
 
     --debug   Debug, without creating the package
     --tmp     Specify the temporary location
@@ -128,11 +127,10 @@ systems (preferably Linux):
 
    By default, make_win_src_distribution creates a zipped
    archive with the name mysql-$version-win-src.zip, where
-   $version is the version of the MySQL source tree you
+   $version represents the version of your MySQL source tree.
-   cloned.
  
  - Copy or upload to your Windows machine the Windows source
-   package that you have just created, and compile it using
+   package that you have just created. To compile it, use
    the instructions in the next section.
 
 ---------------------------------------------------------
@@ -148,20 +146,20 @@ Unpack the Windows source zipped archive to a folder and open
 mysql.dsw from your top-level directory.
 
 If you want to build both release and debug versions, then
-select 'build' -> 'buildall' option. To build only 'release'
+select 'build' -> 'buildall' option. To build only release
-or 'debug' versions, then select all appropriate workspaces
+or debug versions, select all appropriate workspaces from
-from the 'build' -> 'batch build' option.
+the 'build' -> 'batch build' option.
 
-The simplest solution to build basic clients and core
+The simplest solution to building the basic clients and core
 server is to set your current active workspace as 'mysqld'
 release or debug version, and just hit 'build' or 'F7', which
-creates necessary client binaries in the 'client_release' or
+creates the necessary client binaries in the 'client_release'
-'client_debug' directories. The libraries are placed in the
+or 'client_debug' directories. The libraries are placed in the
 'lib_release' and 'lib_debug' directories for release and
 debug versions, respectively.
 
 Now you have built the distribution. If you get any compiler
-errors, please cross check and send the compiler output to 
+errors, please cross check and email the compiler output to 
 win32@lists.mysql.com for further assistance.
 
 ---------------------------------------------------------
@@ -173,16 +171,28 @@ TODO from MySQL PIEFU team.
 6. STARTING THE MYSQL SERVER FOR THE FIRST TIME
 ---------------------------------------------------------
 
-First ensure to set or copy my.ini or my.cnf file to your 
+The server built using the preceding instructions will
-'data' directory that exists in the top-level directory or 
+expect that the MySQL base directory and data directory
-point to existing 'data' directory.
+are C:\mysql and C:\mysql\data by default. If you want to
+test your server using the source root directory and its
+data directory as the base directory and data directory,
+you will need to tell the server their pathnames. You can
+either do this on the command line with the --basedir
+and --data-dir options, or place appropriate options in
+an option file (C:\my.cnf or the my.ini file in your
+Windows directory). If you have an existing data directory
+elsewhere that you want to use, you can specify its pathname
+instead.
 
-Now, start your server from the 'client_release' or
+Start your server from the 'client_release' or 'client_debug'
-'client_debug' directory (depending on which server you
+directory (depending on which server you want to use). The
-want to use), by following the instructions from:
+general instructions are given here:
 
 http://www.mysql.com/doc/en/Windows_installation.html
 
+You'll have to adapt the instructions appropriately if you
+want to use a different base directory and/or data directory.
+
 That's all!!! See, it's as simple to build MySQL on Windows
 as on any other platform!!!
 
@@ -200,12 +210,12 @@ exists in your 'client_release' or 'client_debug' directory.
 ---------------------------------------------------------
 
 - For production use, MySQL AB does not advise using a MySQL
-  server built by yourself from source. Instead, stick to
+  server built by yourself from source. It is preferable to
-  binaries shipped by MySQL AB.
+  stick to using binaries shipped by MySQL AB.
 
 - If you find something not working as expected, or you have
   suggestions about ways to improve the current build process
-  on Windows, please email to 'win32@lists.mysql.com'.
+  on Windows, please email to win32@lists.mysql.com.
 
 Thanks
 MySQL Team

Makefile.am

@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS =	foreign
 EXTRA_DIST =		INSTALL-SOURCE README \
 			COPYING COPYING.LIB
 SUBDIRS =		. include @docs_dirs@ \
-			@readline_topdir@ \
+			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests \
 			BUILD @netware_dir@ os2 @libmysqld_dirs@ \

configure.in

@@ -2176,8 +2176,8 @@ AC_ARG_WITH(libedit,
     [ with_libedit=undefined ]
     )
 
-compile_readline= no
+compile_readline="no"
-compile_libedit= no
+compile_libedit="no"
 
 if [test "$with_libedit" = "yes"] && [test "$with_readline" = "yes"]
 then
@@ -2820,6 +2820,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
  libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
  libmysql/Makefile client/Makefile dnl
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
+ sql-common/Makefile dnl
  merge/Makefile dbug/Makefile scripts/Makefile dnl
  include/Makefile sql-bench/Makefile tools/Makefile dnl
  tests/Makefile Docs/Makefile support-files/Makefile dnl
@@ -2840,6 +2841,7 @@ echo "Remember to check the platform specific part of the reference manual for"
 echo "hints about installing MySQL on your platform. Also have a look at the"
 echo "files in the Docs directory."
 echo
-# The following text is checked in ./Do-compile to se that the configure ends.
+# The following text is checked in ./Do-compile to verify that configure
+# ended sucessfully - don't remove it.
 echo "Thank you for choosing MySQL!"
 echo

include/Makefile.am

@@ -21,7 +21,7 @@ pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h \
 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
-			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
+			sslopt-vars.h sslopt-case.h sql_common.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			nisam.h heap.h merge.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\

scripts/mysql_fix_privilege_tables.sql

@@ -4,7 +4,7 @@ ALTER TABLE host type=MyISAM;
 ALTER TABLE func type=MyISAM;
 ALTER TABLE columns_priv type=MyISAM;
 ALTER TABLE tables_priv type=MyISAM;
-ALTER TABLE user change password password char(45) not null;
+ALTER TABLE user change Password Password char(45) not null;
 ALTER TABLE user add File_priv enum('N','Y') NOT NULL;
 CREATE TABLE IF NOT EXISTS func (
   name char(64) DEFAULT '' NOT NULL,

sql-common/Makefile.am

@@ -0,0 +1,21 @@
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+## Process this file with automake to create Makefile.in
+EXTRA_DIST = client.c pack.c
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%