Commit 0096e197 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-4.1-11707


sql/item_func.cc:
  Auto merged
parents 17556195 b977af8a

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1054,3 +1054,5 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

ndb/tools/ndb_config

support-files/MacOSX/postflight

support-files/MacOSX/preflight

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -70,5 +70,6 @@ hours: 
[serg:]checkout:get

[arjen:]checkout:get

[nick:]checkout:get

[jonas:]checkout:get

checkout:edit

eoln:unix

VC++Files/client/mysqlclient_ia64.dsp

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ SOURCE="..\strings\ctype-czech.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-cp963.c"

SOURCE="..\strings\ctype-cp932.c"

# End Source File

# Begin Source File

VC++Files/sql/mysqld.dsp

+7 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /Fr /YX

# ADD BASE RSC /l 0x410 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -130,7 +130,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,7 +159,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -451,6 +451,10 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_berkeley.cpp

# End Source File

# Begin Source File

acinclude.m4

+13 −4
Original line number Diff line number Diff line
@@ -1723,10 +1723,19 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
              [ndb_debug="$withval"],

              [ndb_debug="default"])

  AC_ARG_WITH([ndb-ccflags],

              [

  --with-ndb-ccflags    Extra CC options for ndb compile],

              [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"],

              [ndb_cxxflags_fix=$ndb_cxxflags_fix])

              AC_HELP_STRING([--with-ndb-ccflags=CFLAGS],

			   [Extra CFLAGS for ndb compile]),

              [ndb_ccflags=${withval}],

              [ndb_ccflags=""])



  case "$ndb_ccflags" in

    "yes")

	AC_MSG_RESULT([The --ndb-ccflags option requires a parameter (passed to CC for ndb compilation)])

	;;

    *)

        ndb_cxxflags_fix="$ndb_cxxflags_fix $ndb_ccflags"

    ;;

  esac



  AC_MSG_CHECKING([for NDB Cluster options])

  AC_MSG_RESULT([])