Commit 00a4a502 authored by sasha@laptop.slkc.uswest.net's avatar sasha@laptop.slkc.uswest.net
Browse files

Merge work.mysql.com:/home/bk/mysql 

into laptop.slkc.uswest.net:/home/sasha/src/mysql
parents b873d68a dd3c64a4

BUILD/compile-pentium-debug

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ C_WARNINGS="$GLOBAL_WARNINGS -Wunused" 
CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"





CFLAGS="-DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \

CXXFLAGS="-DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \

CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \

CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \

./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full \

--with-berkeley-db=/usr/local/BerkeleyDB

make

BUILD/compile-pentium-debug-no-bdb

0 → 100755
+19 −0
Original line number Diff line number Diff line 
make -k clean

/bin/rm -f */.deps/*.P config.cache



aclocal; autoheader; aclocal; automake; autoconf



# If you are not using codefusion add "-Wpointer-arith" to WARNINGS

# The following warning flag will give too many warnings:

# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as

# __attribute()__ doesn't work with gnu C++)



GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"

C_WARNINGS="$GLOBAL_WARNINGS -Wunused"

CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"





CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \

CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \

./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full 

make

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
jcole@tetra.bedford.progress.com

sasha@laptop.slkc.uswest.net

sasha@mysql.sashanet.com

sasha@work.mysql.com

serg@serg.mysql.com

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			opt_range.h opt_ft.h \

			sql_select.h structs.h table.h sql_udf.h hash_filo.h\

			lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \

                        log_event.h mini_client.h sql_repl.h

                        log_event.h mini_client.h sql_repl.h slave.h

mysqld_SOURCES =	sql_lex.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \

			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \

sql/log.cc

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ int MYSQL_LOG::purge_logs(THD* thd, const char* to_log) 
  bool logs_to_purge_inited = 0, logs_to_keep_inited = 0, found_log = 0;

  DYNAMIC_ARRAY logs_to_purge, logs_to_keep;

  my_off_t purge_offset ;

  LINT_INIT(purge_offset);

  pthread_mutex_lock(&LOCK_index);

  

  if(my_fseek(index_file, 0, MY_SEEK_SET,