Commit 3d7999d0 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 17e3ee35 b71afda5

BUILD/SETUP.sh

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" 
# Used in -debug builds

debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "

debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

error_inject="--with-error-inject "

#

# Base C++ flags for all builds

base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ path=`dirname $0` 
. "$path/SETUP.sh" "$@" --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs $max_configs"

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



. "$path/FINISH.sh"

configure.in

+16 −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
@@ -1608,6 +1609,21 @@ else 
  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"

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_debug != "no"

then

  if test "$with_error_inject" = "yes"

  then

    AC_DEFINE([ERROR_INJECT_SUPPORT], [1],

              [Enable error injection in MySQL Server])

  fi

fi



AC_ARG_WITH([fast-mutexes],

	    AC_HELP_STRING([--with-fast-mutexes], 

	    [Compile with fast mutexes (default is disabled)]),

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

mysql-test/r/ndb_partition_key.result

+14 −0
Original line number Diff line number Diff line
@@ -165,6 +165,20 @@ ENGINE=NDB 
PARTITION BY KEY(c3) PARTITIONS 5;

ALTER TABLE t1 COALESCE PARTITION 4;

DROP TABLE t1;

CREATE TABLE t1 (a int primary key)

ENGINE=NDB

PARTITION BY KEY(a);

ALTER TABLE t1 OPTIMIZE PARTITION p0;

ERROR HY000: Table storage engine for 't1' doesn't have this option

ALTER TABLE t1 CHECK PARTITION p0;

ERROR HY000: Table storage engine for 't1' doesn't have this option

ALTER TABLE t1 REPAIR PARTITION p0;

ERROR HY000: Table storage engine for 't1' doesn't have this option

ALTER TABLE t1 ANALYZE PARTITION p0;

ERROR HY000: Table storage engine for 't1' doesn't have this option

ALTER TABLE t1 REBUILD PARTITION p0;

ERROR HY000: Table storage engine for 't1' doesn't have this option

DROP TABLE t1;

CREATE TABLE t1 (

c1 MEDIUMINT NOT NULL AUTO_INCREMENT,

c2 TEXT NOT NULL,