Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/push-5.0

into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/push-5.1


libmysql/libmysql.c:
  Auto merged

win/build-nmake-x64.bat

+@echo off
+
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+if exist cmakecache.txt del cmakecache.txt
+copy win\nmake_x64_cache.txt cmakecache.txt
+cmake -G "NMake Makefiles"
+copy cmakecache.txt win\nmake_x64_cache.txt

win/build-nmake.bat

+@echo off
+
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+if exist cmakecache.txt del cmakecache.txt
+copy win\nmake_cache.txt cmakecache.txt
+cmake -G "NMake Makefiles"
+copy cmakecache.txt win\nmake_cache.txt