Commit 57a752f4 authored by unknown's avatar unknown
Browse files

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

into  selena.:H:/MYSQL/bkt/mysql-5.0
parents 303cae4c 67df0e19

VC++Files/mysqlbinlog/mysqlbinlog.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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];