Commit be188b11 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents e66e6a0b 6a387c7c

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
jani@janikt.pp.saunalahti.fi

monty@hundin.mysql.fi

mwagner@evoq.mwagner.org

Docs/manual.texi

+7 −7
Original line number Diff line number Diff line
@@ -8488,7 +8488,7 @@ The following @code{configure} command should work: 
@example

shell> CFLAGS="-D_XOPEN_XPG4" CXX=gcc CXXFLAGS="-D_XOPEN_XPG4" \

       ./configure \

           --with-debug --prefix=/usr/local/mysql \

           --prefix=/usr/local/mysql \

           --with-named-thread-libs="-lgthreads -lsocket -lgen -lgthreads" \

           --with-named-curses-libs="-lcurses"

@end example
@@ -9525,19 +9525,19 @@ and are configured with the following compilers and options: 
@code{CC=gcc CXX=gcc CXXFLAGS="-O3 -felide-constructors" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-assembler}















@item SunOS 5.5.1 sun4u with @code{egcs} 1.0.3a













@code{CC=gcc CFLAGS="-O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-low-memory --with-extra-charsets=complex}













@code{CC=gcc CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-low-memory --with-extra-charsets=complex}





























@item SunOS 5.6 sun4u with @code{egcs} 2.90.27













@code{CC=gcc CFLAGS="-O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-low-memory --with-extra-charsets=complex}













@code{CC=gcc CFLAGS="-O3" CXX=gcc CXXFLAGS="-O3 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-low-memory --with-extra-charsets=complex}





























@item SunOS 5.6 i86pc with @code{gcc} 2.8.1















@code{CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql --with-low-memory --with-extra-charsets=complex}





























@item Linux 2.0.33 i386 with @code{pgcc} 2.90.29 (@code{egcs} 1.0.3a)













@code{CFLAGS="-O3 -mpentium -mstack-align-double -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -mpentium -mstack-align-double -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --with-extra-charsets=complex}













@code{CFLAGS="-O3 -mpentium -mstack-align-double" CXX=gcc CXXFLAGS="-O3 -mpentium -mstack-align-double -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --with-extra-charsets=complex}





























@item Linux 2.2.x with x686 with @code{gcc} 2.95.2













@code{CFLAGS="-O3 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charset=complex}













@code{CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charset=complex}





























@item SCO 3.2v5.0.4 i386 with @code{gcc} 2.7-95q4















@code{CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex}










@@ -10740,8 +10740,8 @@ the old @code{ISAM} type.  You don't have to convert your old tables to













use these with Version 3.23.  By default, all new tables will be created with















type @code{MyISAM} (unless you start @code{mysqld} with the















@code{--default-table-type=isam} option). You can change an @code{ISAM}













table to a @code{MyISAM} table with @code{ALTER TABLE} or the Perl script













@code{mysql_convert_table_format}.













table to a @code{MyISAM} table with @code{ALTER TABLE table_name TYPE=MyISAM}













or the Perl script @code{mysql_convert_table_format}.





























Version 3.22 and 3.21 clients will work without any problems with a Version















3.23 server.

























configure.in



+6
−1






























Original line number
Diff line number
Diff line








@@ -755,6 +755,11 @@ case $SYSTEM_TYPE in













    echo "Enabling snprintf workaround for hpux 10.20"















    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ"















    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ"













    if test "$with_named_thread" = "no"













    then 













      echo "Using --with-named-thread=-lpthread"













      with_named_thread="-lcma"













    fi















    ;;















  *hpux11.*)















    echo "Enabling pread/pwrite workaround for hpux 11"










@@ -1051,7 +1056,7 @@ fi













AC_MSG_CHECKING("named thread libs:")















if test "$with_named_thread" != "no"















then













  LIBS="$LIBS $with_named_thread"













  LIBS="$with_named_thread $LIBS $with_named_thread"















  with_posix_threads="yes"















  with_mit_threads="no"















  AC_MSG_RESULT("$with_named_thread")

































include/my_sys.h



+14
−0






























Original line number
Diff line number
Diff line








@@ -62,6 +62,8 @@ extern int NEAR my_errno;		/* Last error in mysys */













#define MY_DONT_CHECK_FILESIZE 128	/* Option to init_io_cache() */















#define MY_LINK_WARNING 32	/* my_redel() gives warning if links */















#define MY_COPYTIME	64	/* my_redel() copys time */













#define MY_DELETE_OLD	256	/* my_create_with_symlink() */













#define MY_RESOLVE_LINK 128	/* my_realpath(); Only resolve links */















#define MY_HOLD_ORIGINAL_MODES 128  /* my_copy() holds to file modes */















#define MY_REDEL_MAKE_BACKUP 256















#define MY_SEEK_NOT_DONE 32	/* my_lock may have to do a seek */










@@ -378,6 +380,12 @@ extern File my_create(const char *FileName,int CreateFlags,













		      int AccsesFlags, myf MyFlags);















extern int my_close(File Filedes,myf MyFlags);















extern int my_mkdir(const char *dir, int Flags, myf MyFlags);













extern int my_readlink(char *to, const char *filename, myf MyFlags);













extern int my_realpath(char *to, const char *filename, myf MyFlags);













extern File my_create_with_symlink(const char *linkname, const char *filename,













				   int createflags, int access_flags,













				   myf MyFlags);













extern int my_symlink(const char *content, const char *linkname, myf MyFlags);















extern uint my_read(File Filedes,byte *Buffer,uint Count,myf MyFlags);















extern uint my_pread(File Filedes,byte *Buffer,uint Count,my_off_t offset,















		     myf MyFlags);










@@ -428,8 +436,14 @@ extern int my_redel(const char *from, const char *to, int MyFlags);













extern int my_copystat(const char *from, const char *to, int MyFlags);















extern my_string my_filename(File fd);





























#ifndef THREAD















extern void dont_break(void);















extern void allow_break(void);













#else













#define dont_break()













#define allow_break()













#endif





























extern void my_remember_signal(int signal_number,sig_handler (*func)(int));















extern void caseup(my_string str,uint length);















extern void casedn(my_string str,uint length);

































include/mysys_err.h



+4
−1






























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ extern "C" {













#endif































#define GLOB		0	/* Error maps */













#define GLOBERRS	24	/* Max number of error messages in map's */













#define GLOBERRS	27	/* Max number of error messages in map's */















#define EE(X)	globerrs[ X ]	/* Defines to add error to right map */































extern const char * NEAR globerrs[];	/* my_error_messages is here */










@@ -51,6 +51,9 @@ extern const char * NEAR globerrs[];	/* my_error_messages is here */













#define EE_CANT_MKDIR		21















#define EE_UNKNOWN_CHARSET	22















#define EE_OUT_OF_FILERESOURCES	23













#define EE_CANT_READLINK	24













#define EE_CANT_SYMLINK		25













#define EE_REALPATH		26































#ifdef	__cplusplus















}