Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel

into  selena.:H:/MYSQL/bkt/mysql-5.0

VC++Files/mysqlbinlog/mysqlbinlog.vcproj

@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include,../,../sql"
+				AdditionalIncludeDirectories="../include,../,../sql,../strings"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS;MYSQL_SERVER"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\Debug/mysqlbinlog.pch"

include/config-win.h

@@ -392,8 +392,8 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_SPATIAL 1
 #define HAVE_RTREE_KEYS 1
 
-#define HAVE_OPENSSL 1
-#define HAVE_YASSL 1
+/* #undef HAVE_OPENSSL */
+/* #undef HAVE_YASSL */
 
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */

mysql-test/mysql-test-run.pl

@@ -930,7 +930,7 @@ sub executable_setup () {
     }
     $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");
     $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
-    $exe_mysqlimport=      mtr_exe_exists("$path_client_bindir/mysqlimport");
+    $exe_mysqlimport=    mtr_exe_exists("$path_client_bindir/mysqlimport");
     $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
     $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
     $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
@@ -947,6 +947,7 @@ sub executable_setup () {
     $path_client_bindir= mtr_path_exists("$glob_basedir/bin");
     $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");
     $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
+    $exe_mysqlimport=    mtr_exe_exists("$path_client_bindir/mysqlimport");
     $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
     $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
     $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");

sql/ha_innodb.cc

@@ -3009,8 +3009,8 @@ ha_innobase::store_key_val_for_row(
 
 			if (key_part->length > 0 && cs->mbmaxlen > 1) {
 				len = (ulint) cs->cset->well_formed_len(cs, 
-					src_start,
-					src_start + key_part->length,
+					(const char *) src_start,
+					(const char *) src_start + key_part->length,
 					key_part->length / cs->mbmaxlen, 
 					&error);
 			} else {

sql/spatial.cc

@@ -178,7 +178,9 @@ static double wkb_get_double(const char *ptr, Geometry::wkbByteOrder bo)
 {
   double res;
   if (bo != Geometry::wkb_xdr)
+  {
     float8get(res, ptr);
+  }
   else
   {
     char inv_array[8];

support-files/mysql.spec.sh

@@ -259,7 +259,6 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --includedir=%{_includedir} \
             --mandir=%{_mandir} \
 	    --enable-thread-safe-client \
-	    --with-zlib-dir=bundled \
 	    --with-readline ; \
 	    # Add this for more debugging support
 	    # --with-debug
@@ -362,8 +361,9 @@ BuildMySQL "--disable-shared \
 %if %{STATIC_BUILD}
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
-		--with-zlib-dir=bundled \
 		$USE_OTHER_LIBC_DIR \
+%else
+		--with-zlib-dir=bundled \
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \