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

More debug info 

Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98
parent 228de3b0

Docs/manual.texi

+0 −3
Original line number Diff line number Diff line
@@ -32591,9 +32591,6 @@ tblTemp1.fldOrder_ID > 100; 
The following conditions hold for an @code{INSERT ... SELECT} statement:















@itemize @minus













@item













The query cannot contain an @code{ORDER BY} clause.



























@item















The target table of the @code{INSERT} statement cannot appear in the















@code{FROM} clause of the @code{SELECT} part of the query because it's

























bdb/os_win32/os_rename.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -47,7 +47,7 @@ __os_rename(dbenv, old, new)













		 */















		if (MoveFileEx(old, new, MOVEFILE_REPLACE_EXISTING) != TRUE)















			ret = __os_win32_errno();













		if (ret == ENOENT && MoveFile(old, new) == TRUE)













		if ((ret == ENOENT || ret == EIO) && MoveFile(old, new) == TRUE)















			ret = 0;















	}















	if (ret != 0)

































configure.in



+2
−4






























Original line number
Diff line number
Diff line








@@ -797,10 +797,8 @@ case $SYSTEM_TYPE in













  *darwin*)















    if test "$ac_cv_prog_gcc" = "yes"















    then













      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS"













      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS"













      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE"













      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE"













      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"













      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"















      MAX_C_OPTIMIZE="-O"















      with_named_curses=""















    fi

































include/dbug.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -66,7 +66,7 @@ extern	void _db_unlock_file();













#define DEBUGGER_ON  _no_db_=0















#define DBUG_LOCK_FILE { _db_lock_file(); }















#define DBUG_UNLOCK_FILE { _db_unlock_file(); }













#define DBUG_ASSERT(A) A













#define DBUG_ASSERT(A) assert(A)















#else						/* No debugger */































#define DBUG_ENTER(a1)

































mysys/thr_lock.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -736,7 +736,7 @@ void thr_unlock(THR_LOCK_DATA *data)













			     data->type == TL_WRITE_ALLOW_WRITE));















      else















      {













	DBUG_PRINT("lock",("No locks to free"));













	DBUG_PRINT("lock",("No waiting read locks to free"));















      }















    }















    else if (data &&