Commit c8e16062 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


configure.in:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents ab161754 7e219636

VC++Files/libmysqld/libmysqld.vcproj

+118 −118

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/sql/mysqld.vcproj

+82 −7
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -148,7 +148,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -212,7 +212,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -276,7 +276,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -336,7 +336,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqld.pch"

				AssemblerListingLocation=".\debug/"
@@ -398,7 +398,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"

				PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE"

				PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -521,7 +521,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../zlib,../include,../regex,../extra/yassl/include"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -1326,6 +1326,81 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="examples\ha_example.cpp">

			<FileConfiguration

				Name="classic nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="ha_berkeley.cpp">

			<FileConfiguration

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.13-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.12-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=13

NDB_VERSION_BUILD=12

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -2446,7 +2446,7 @@ thread_dirs= 


dnl This probably should be cleaned up more - for now the threaded

dnl client is just using plain-old libs.

sql_client_dirs="strings regex mysys sql/share libmysql client"

sql_client_dirs="strings regex mysys libmysql client"

linked_client_targets="linked_libmysql_sources"



if test "$THREAD_SAFE_CLIENT" != "no"

include/my_global.h

+8 −2
Original line number Diff line number Diff line
@@ -925,20 +925,24 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
#define MY_HOW_OFTEN_TO_ALARM	2	/* How often we want info on screen */

#define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */



#ifndef set_timespec

#ifdef HAVE_TIMESPEC_TS_SEC

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{ \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).ts_sec=  (now / ULL(10000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#else

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{\

  struct timeval tv;\
@@ -946,14 +950,16 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).tv_sec=  (now / ULL(10000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100));    \

}

#endif /* !set_timespec_nsec */

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */



/*

  Define-funktions for reading and storing in machine independent format

mysql-test/lib/mtr_process.pl

+1 −0
Original line number Diff line number Diff line
@@ -841,6 +841,7 @@ sub sleep_until_file_created ($$$) { 
sub mtr_exit ($) {

  my $code= shift;

#  cluck("Called mtr_exit()");

  mtr_timer_stop_all($::glob_timers);

  local $SIG{HUP} = 'IGNORE';

  kill('HUP', -$$);

  sleep 2;