Commit fe07d436 authored by unknown's avatar unknown
Browse files

Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
parents 0ced3bfc 3afb61e1

Build-tools/mysql-copyright-2

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ sub add_copyright 
    $line_copyright= "! ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.sql$/)

  {

    $start_copyright="-- ";

    $line_copyright= "-- ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.asm$/)

  {

    $start_copyright="; ";

VC++Files/mysql.dsw

+36 −20
Original line number Diff line number Diff line
@@ -741,9 +741,9 @@ Package=<5> 
{{{


}}}





Package=<4>

{{{

    Begin Project Dependency

{{{
    Begin Project Dependency

    Project_Dep_Name libmysql

    End Project Dependency

    Begin Project Dependency
@@ -756,7 +756,7 @@ Package=<4> 


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



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

Project: "mysql_client_test"=.\tests\mysql_client_test.dsp - Package Owner=<4>






Package=<5>

{{{
@@ -764,14 +764,30 @@ Package=<5> 






Package=<4>



{{{

    Begin Project Dependency


}}}






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





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



Package=<5>

{{{

}}}



Package=<4>

{{{
    Begin Project Dependency

    Project_Dep_Name mysqltest

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mysqladmin

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mysql_client_test

    End Project Dependency

}}}





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



Global:

VC++Files/tests/mysql_client_test.dsp

0 → 100644
+94 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mysql_client_test" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



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



CFG=mysql_client_test - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "mysql_client_test.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "mysql_client_test.mak" CFG="mysql_client_test - Win32 Debug"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "mysql_client_test - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "mysql_client_test - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "mysql_client_test - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# 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 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_client_test.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_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

# ADD BASE MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Debug\mysql_client_test.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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.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 mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 



!ELSEIF  "$(CFG)" == "mysql_client_test - 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 Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# 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 /Fp".\Release/client_test.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/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\client_test.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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /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:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF



# Begin Target



# Name "mysql_client_test - Win32 Debug"

# Name "mysql_client_test - Win32 Release"

# Begin Source File



SOURCE=tests\mysql_client_test.c

# End Source File

# End Target

# End Project

config/ac-macros/zlib.m4

+13 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ dnl Define zlib paths to point at bundled zlib 
AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

ZLIB_DEPS="-lz"

zlib_dir="zlib"

AC_SUBST([zlib_dir])

mysql_cv_compress="yes"
@@ -44,8 +46,13 @@ dnl $prefix/lib. If zlib headers or binaries weren't found at $prefix, the 
dnl   macro bails out with error.

dnl 

dnl If the library was found, this function #defines HAVE_COMPRESS

dnl and configure variables ZLIB_INCLUDES (i.e. -I/path/to/zlib/include) and

dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz).

dnl and configure variables ZLIB_INCLUDES (i.e. -I/path/to/zlib/include),

dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz) and ZLIB_DEPS which is

dnl used in mysql_config and is always the same as ZLIB_LIBS except to

dnl when we use the bundled zlib. In the latter case ZLIB_LIBS points to the

dnl build dir ($top_builddir/zlib), while mysql_config must point to the

dnl installation dir ($pkglibdir), so ZLIB_DEPS is set to point to

dnl $pkglibdir.



AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [

AC_MSG_CHECKING([for zlib compression library])
@@ -94,7 +101,11 @@ case $SYSTEM_TYPE in 
        ;;

    esac

    if test "$mysql_cv_compress" = "yes"; then

      if test "x$ZLIB_DEPS" = "x"; then

        ZLIB_DEPS="$ZLIB_LIBS"

      fi

      AC_SUBST([ZLIB_LIBS])

      AC_SUBST([ZLIB_DEPS])

      AC_SUBST([ZLIB_INCLUDES])

      AC_DEFINE([HAVE_COMPRESS], [1], [Define to enable compression support])

    fi

mysql-test/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ dist-hook: 
		$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data
@@ -65,7 +65,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data