Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 (73165eca) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -945,3 +945,4 @@ libmysqld/ha_example.cc
		libmysqld/ha_tina.cc
		analyse.test
		client/mysqladmin.c
		mysql-4.1.8-win-src.zip

VC++Files/client/mysqltest.dsp

+8 −8

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ RSC=rc.exe
		# PROP Output_Dir ".\debug"
		# PROP Intermediate_Dir ".\debug"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "USE_TLS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "USE_TLS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
		# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
		# ADD BASE RSC /l 1033 /d "_DEBUG"
		@@ -52,8 +52,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib mysys.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib mysys.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_debug\mysqltest.exe" /incremental:no /libpath:"..\lib_debug\" /debug /pdb:".\debug\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ELSEIF "$(CFG)" == "mysqltest - Win32 classic"

		@@ -77,8 +77,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ELSEIF "$(CFG)" == "mysqltest - Win32 Release"

		@@ -102,8 +102,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib odbc32.lib odbccp32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ENDIF

VC++Files/mysql-test/mysql_test_run_new.dsp

+27 −27

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		# Microsoft Developer Studio Generated Build File, Format Version 6.00
		# DO NOT EDIT

		# TARGTYPE "Win32 (x86) Application" 0x0101
		# TARGTYPE "Win32 (x86) Console Application" 0x0103

		CFG=mysql_test_run_new - Win32 Debug
		!MESSAGE This is not a valid makefile. To build this project using NMAKE,
		@@ -17,8 +17,8 @@ CFG=mysql_test_run_new - Win32 Debug
		!MESSAGE
		!MESSAGE Possible choices for configuration are:
		!MESSAGE
		!MESSAGE "mysql_test_run_new - Win32 Debug" (based on "Win32 (x86) Application")
		!MESSAGE "mysql_test_run_new - Win32 Release" (based on "Win32 (x86) Application")
		!MESSAGE "mysql_test_run_new - Win32 Debug" (based on "Win32 (x86) Console Application")
		!MESSAGE "mysql_test_run_new - Win32 Release" (based on "Win32 (x86) Console Application")
		!MESSAGE

		# Begin Project
		@@ -33,51 +33,51 @@ RSC=rc.exe

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 1
		# PROP BASE Output_Dir "Debug"
		# PROP BASE Intermediate_Dir "Debug"
		# PROP BASE Output_Dir ".\Debug"
		# PROP BASE Intermediate_Dir ".\Debug"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 1
		# PROP Output_Dir "Debug"
		# PROP Intermediate_Dir "Debug"
		# PROP Output_Dir ".\Debug"
		# PROP Intermediate_Dir ".\Debug"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\debug/mysql_test_run.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\debug/mysql_test_run.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
		# ADD BASE MTL /nologo /win32
		# ADD MTL /nologo /win32
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
		# ADD BASE MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
		# ADD MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
		# ADD BASE RSC /l 1033
		# ADD RSC /l 1033
		BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /debug /pdb:".\debug\mysql_test_run_new.pdb" /pdbtype:sept /map /mapinfo:exports /subsystem:windows
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /debug /pdb:".\debug\mysql_test_run_new.pdb" /pdbtype:sept /map /mapinfo:exports /subsystem:windows
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:yes /debug /pdb:".\Debug\mysql_test_run_new.pdb" /pdbtype:sept /map:".\Debug\mysql_test_run_new.map" /subsystem:console
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:yes /debug /pdb:".\Debug\mysql_test_run_new.pdb" /pdbtype:sept /map:".\Debug\mysql_test_run_new.map" /subsystem:console

		!ELSEIF "$(CFG)" == "mysql_test_run_new - Win32 Release"

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 0
		# PROP BASE Output_Dir "Release"
		# PROP BASE Intermediate_Dir "Release"
		# PROP BASE Output_Dir ".\Release"
		# PROP BASE Intermediate_Dir ".\Release"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 0
		# PROP Output_Dir "Release"
		# PROP Intermediate_Dir "Release"
		# PROP Output_Dir ".\Release"
		# PROP Intermediate_Dir ".\Release"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fo".\release/" /Fd".\release/" /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fo".\release/" /Fd".\release/" /c /GX
		# ADD BASE MTL /nologo /win32
		# ADD MTL /nologo /win32
		# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
		# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
		# ADD BASE MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
		# ADD MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
		# ADD BASE RSC /l 1033
		# ADD RSC /l 1033
		BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /pdbtype:sept /subsystem:windows
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /pdbtype:sept /subsystem:windows
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:windows
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:windows

		!ENDIF

		@@ -87,19 +87,19 @@ LINK32=link.exe
		# Name "mysql_test_run_new - Win32 Release"
		# Begin Source File

		SOURCE=my_create_tables.c
		SOURCE=.\my_create_tables.c
		# End Source File
		# Begin Source File

		SOURCE=my_manage.c
		SOURCE=.\my_manage.c
		# End Source File
		# Begin Source File

		SOURCE=my_manage.h
		SOURCE=.\my_manage.h
		# End Source File
		# Begin Source File

		SOURCE=mysql_test_run_new.c
		SOURCE=.\mysql_test_run_new.c
		# End Source File
		# End Target
		# End Project

VC++Files/mysql.dsw

+16 −1

Original line number	Diff line number	Diff line
		@@ -824,11 +824,20 @@ Package=<5>

		Package=<4>
		{{{
		Begin Project Dependency
		Project_Dep_Name libmysql
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysys
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name regex
		End Project Dependency
		}}}

		###############################################################################

		Project: "mysql_test_run_new"=.\mysql-test\mysql_test_run_new.dsp - Package Owner=<4>
		Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>

		Package=<5>
		{{{
		@@ -836,6 +845,12 @@ Package=<5>

		Package=<4>
		{{{
		Begin Project Dependency
		Project_Dep_Name mysqltest
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqladmin
		End Project Dependency
		}}}

		###############################################################################

client/mysqltest.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ typedef struct
		int alloced;
		} VAR;

		#ifdef __NETWARE__
		#if defined(__NETWARE__) \|\| defined(__WIN__)
		/*
		Netware doesn't proved environment variable substitution that is done
		by the shell in unix environments. We do this in the following function:
		@@ -4600,6 +4600,9 @@ static char subst_env_var(const char str)
		*/

		#undef popen /* Remove wrapper */
		#ifdef __WIN__
		#define popen _popen /* redefine for windows */
		#endif

		FILE my_popen(const char cmd, const char *mode __attribute__((unused)))
		{