Commit 1154609c authored by unknown's avatar unknown
Browse files

Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs 

into  c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
dbug/dbug.c:
  Manual merge
include/my_dbug.h:
  Manual merge
sql/ha_heap.cc:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/ha_partition.cc:
  Manual merge
sql/log.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
parents 613d1721 5b6c6c49

BUILD/SETUP.sh

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ pentium_cflags="$check_cpu_cflags" 
pentium64_cflags="$check_cpu_cflags -m64"

ppc_cflags="$check_cpu_cflags"

sparc_cflags=""

error_inject="--with-error-inject "



# be as fast as we can be without losing our ability to backtrace

fast_cflags="-O3 -fno-omit-frame-pointer"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"

extra_configs="$pentium_configs $debug_configs $max_configs $error_inject"



. "$path/FINISH.sh"

configure.in

+13 −0
Original line number Diff line number Diff line
@@ -663,6 +663,7 @@ else 
  AC_MSG_RESULT([no])

fi



  

MYSQL_SYS_LARGEFILE



# Types that must be checked AFTER large file support is checked
@@ -1563,6 +1564,18 @@ then 
  DEBUG_OPTIMIZE_CXX=""

fi



# If we should allow error injection tests

AC_ARG_WITH(error-inject,

    [ --with-error-inject    Enable error injection in MySQL Server],

    [ with_error_inject=$withval ],

    [ with_error_inject=no ])



if test "$with_error_inject" = "yes"

then

  CFLAGS="-DERROR_INJECT_SUPPORT $CFLAGS"

  CXXFLAGS="-DERROR_INJECT_SUPPORT $CXXFLAGS"

fi



AC_ARG_WITH(debug,

    [  --without-debug         Build a production version without debugging code],

    [with_debug=$withval],

dbug/dbug_long.h

+13 −0
Original line number Diff line number Diff line
@@ -127,6 +127,11 @@ 
#    define DBUG_SETJMP setjmp

#    define DBUG_LONGJMP longjmp

#    define DBUG_DUMP(keyword,a1)

#    define DBUG_EXECUTE_IF(keyword, a1)

#    define DBUG_EXECUTE_COND(keyword, a1) 0

#    define DBUG_COND(keyword) 0

#    define DBUG_ADD_KEYWORD(key)

#    define DBUG_DEL_KEYWORD(key)

# else

#    define DBUG_ENTER(a) \

	auto char *_db_func_; auto char *_db_file_; auto int _db_level_; \
@@ -157,4 +162,12 @@ 
#    define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))

#    define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))

#    define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)

#    define DBUG_EXECUTE_IF(keyword,a1) \

        {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}}

#    define DBUG_EXECUTE_COND(keyword, a1) \

        (_db_on_ ? ((_db_strict_keyword_ (keyword)) ? ((a1), 0) : 0) : 0)

#    define DBUG_COND(keyword) \

        ((_db_on_ && _db_strict_keyword_ (keyword)) ? 1 : 0)

#    define DBUG_ADD_KEYWORD(key) _db_add_strict_keyword_(key)

#    define DBUG_DEL_KEYWORD(key) _db_del_strict_keyword_(key)

# endif

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ extern File my_register_filename(File fd, const char *FileName, 
				 enum file_type type_of_file,

				 uint error_message_number, myf MyFlags);

extern File my_create(const char *FileName,int CreateFlags,

		      int AccsesFlags, myf MyFlags);

		      int AccessFlags, myf MyFlags);

extern int my_close(File Filedes,myf MyFlags);

extern File my_dup(File file, myf MyFlags);

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