Commit 88a1cff6 authored by unknown's avatar unknown
Browse files

Merge c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new 

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


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/mysql_priv.h:
  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
sql/unireg.cc:
  Auto merged
sql/ha_heap.cc:
  manual merge
sql/ha_myisammrg.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.h:
  manual merge
sql/log.cc:
  manual merge
sql/mysqld.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
parents b3bdc112 26416bf5

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
@@ -666,6 +666,7 @@ else 
  AC_MSG_RESULT([no])

fi



  

MYSQL_SYS_LARGEFILE



# Types that must be checked AFTER large file support is checked
@@ -1566,6 +1567,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,

    [  --with-debug            Add debug code

  --with-debug=full       Add debug code (adds memory checker, very slow)],

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);

sql/ha_ndbcluster.cc

+7 −1
Original line number Diff line number Diff line
@@ -4546,7 +4546,9 @@ int ha_ndbcluster::create(const char *name, 
  DBUG_RETURN(my_errno);

}



int ha_ndbcluster::create_handler_files(const char *file) 

int ha_ndbcluster::create_handler_files(const char *file,

                                        const char *old_name,

                                        bool rename_flag) 

{ 

  const char *name;

  Ndb* ndb;
@@ -4557,6 +4559,10 @@ int ha_ndbcluster::create_handler_files(const char *file) 


  DBUG_ENTER("create_handler_files");



  if (rename_flag)

  {

    DBUG_RETURN(FALSE);

  }

  if (!(ndb= get_ndb()))

    DBUG_RETURN(HA_ERR_NO_CONNECTION);