Commit aa43bc07 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents f4ce3ec1 d9427109

BUILD/compile-hpux11-parisc2-aCC

+10 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ release_flags="-fast +O3" 
#                note on pointers below.

cflags="-g -z +O0"

cxxflags="-g0 -z +O0"

debug_conigure_options="--with-debug"

debug_configure_options="--with-debug"



while [ "$#" != 0 ]; do 

  case "$1" in

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -423,6 +423,10 @@ SOURCE=..\mysys\my_static.c 
# End Source File

# Begin Source File



SOURCE=..\strings\my_strtoll10.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_symlink.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -383,6 +383,10 @@ SOURCE=..\mysys\my_static.c 
# End Source File

# Begin Source File



SOURCE=..\strings\my_strtoll10.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_symlink.c

# End Source File

# Begin Source File

client/mysqlimport.c

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ static int write_to_table(char *filename, MYSQL *sock) 
{

  char tablename[FN_REFLEN], hard_path[FN_REFLEN],

       sql_statement[FN_REFLEN*16+256], *end;

  my_bool local_file;

  DBUG_ENTER("write_to_table");

  DBUG_PRINT("enter",("filename: %s",filename));

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 4.1.6-gamma)

AM_INIT_AUTOMAKE(mysql, 4.1.7-gamma)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10