Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1

BUILD/autorun.sh

@@ -3,20 +3,29 @@
 
 die() { echo "$@"; exit 1; }
 
-# Added glibtoolize reference to make native OSX autotools work
-if [ -f /usr/bin/glibtoolize ]
+# Handle "glibtoolize" (e.g., for native OS X autotools) as another
+# name for "libtoolize". Use the first one, either name, found in PATH.
+LIBTOOLIZE=libtoolize  # Default
+IFS="${IFS=   }"; save_ifs="$IFS"; IFS=':'
+for dir in $PATH
+do
+  if test -x $dir/glibtoolize
   then
     LIBTOOLIZE=glibtoolize
-  else
-    LIBTOOLIZE=libtoolize
-fi
+    break
+  elif test -x $dir/libtoolize
+  then
+    break
+  fi
+done
+IFS="$save_ifs"
 
 aclocal || die "Can't execute aclocal" 
 autoheader || die "Can't execute autoheader"
 # --force means overwrite ltmain.sh script if it already exists 
-$LIBTOOLIZE --automake --force || die "Can't execute libtoolize"
+$LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize"
   
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
-automake --add-missing --force || die "Can't execute automake"
+automake --add-missing --force  --copy || die "Can't execute automake"
 autoconf || die "Can't execute autoconf"

BUILD/compile-dist

@@ -7,14 +7,9 @@
 # package" that is used as the basis for all other binary builds.
 #
 test -f Makefile && make maintainer-clean
-(cd storage/innobase && aclocal && autoheader && \
-    libtoolize --automake --force --copy && \
-    automake --force --add-missing --copy && autoconf)
-aclocal
-autoheader
-libtoolize --automake --force --copy
-automake --force --add-missing --copy
-autoconf
+
+path=`dirname $0`
+. $path/autorun.sh
 
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then

BitKeeper/triggers/pre-commit.check-case.pl

+#!/usr/bin/perl
+my $status = 0;
+
+my $pending = $ENV{'BK_PENDING'};
+exit 0 unless -f $pending;
+
+open FI, "<", $pending || exit 0;
+while(<FI>) {
+	my ($file, $stuff) = split /\|/, $_, 2;
+	next unless -f $file;
+	$file =~ s/^(.*)\/([^\/]*)$/$2/;
+	my $path = $1;
+	opendir DIR, $path;
+	my @files = sort map { lc } readdir DIR;
+	closedir DIR;
+	my %count = ();
+	$count{$_}++ for @files;
+	@files = grep { $count{$_} > 1 } keys %count;
+	if(@files > 0) {
+		print "$path/$file: duplicate file names: " . (join " ", @files) . "\n";
+		$status = 1;
+	}
+}
+close FI;
+
+exit $status;

CMakeLists.txt

@@ -135,6 +135,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT       ${CMAKE_CXX_FLAGS_INIT})
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
 
+    # Disable automatic manifest generation.
+    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
+    	   ${CMAKE_EXE_LINKER_FLAGS})
+    # Explicitly disable it since it is the default for newer versions of VS
+    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
+    IF(NOT tmp_manifest)
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+    ENDIF(NOT tmp_manifest)
+
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
       CMAKE_GENERATOR MATCHES "Visual Studio 8")
 
@@ -184,14 +193,6 @@ IF(EMBED_MANIFESTS)
         MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
     ENDIF(HAVE_SIGN_TOOL)
 
-    # Disable automatic manifest generation.
-    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
-    	   ${CMAKE_EXE_LINKER_FLAGS})
-    # Explicitly disable it since it is the default for newer versions of VS
-    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
-    IF(NOT tmp_manifest)
-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    ENDIF(NOT tmp_manifest)
     # Set the processor architecture.
     IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
     	SET(PROCESSOR_ARCH "amd64") 

Makefile.am

@@ -66,7 +66,7 @@ tags:
   test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
   test-unit test-ps test-nr test-pr test-ns test-binlog-statement \
   test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp \
-  test-ext-stress test-ext \
+  test-ext-stress test-ext test-embedded \
   test-fast test-fast-cursor test-fast-view test-fast-prepare \
   test-full-qa
 
@@ -101,6 +101,15 @@ test-binlog-statement:
 	cd mysql-test ; \
 	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
 
+test-embedded:
+	if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	  @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+	    --embedded-server --skip-rpl --skip-ndbcluster ; \
+	else \
+	  echo "no program found for 'embedded' tests - skipped testing" ; \
+	fi
+
 test:	test-unit test-ns test-pr
 
 test-full:	test test-nr test-ps
@@ -131,11 +140,7 @@ test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \
 	--with-ndbcluster-only
-	-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
-	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	  @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
-	    --embedded-server --skip-rpl --skip-ndbcluster ; \
-	fi
+	-$(MAKE) test-embedded
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \

cmd-line-utils/libedit/Makefile.am

@@ -5,8 +5,7 @@
 ASRC =			$(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
 AHDR =			vi.h emacs.h common.h
 
-# Make sure to include stuff from this directory first, to get right "config.h"
-INCLUDES =		-I. -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_LIBRARIES =	libedit.a
 
@@ -31,7 +30,14 @@ EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c
 
 CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c
 
-DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR 
+# Make sure to include stuff from this directory first, to get right "config.h"
+# Automake puts into DEFAULT_INCLUDES this source and corresponding
+# build directory together with ../../include to let all make files
+# find the central "config.h". This variable is used before INCLUDES
+# above. But in automake 1.10 the order of these are changed. Put the
+# includes of this directory into DEFS to always be sure it is first
+# before DEFAULT_INCLUDES on the compile line.
+DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR -I. -I$(srcdir)
 
 SUFFIXES = .sh
 

configure.in

@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.23-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.23-rc)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -95,6 +95,8 @@ case $MACHINE_TYPE in
 esac
 
 # Save some variables and the command line options for mysqlbug
+SAVE_CC="$CC"
+SAVE_CXX="$CXX"
 SAVE_ASFLAGS="$ASFLAGS"
 SAVE_CFLAGS="$CFLAGS"
 SAVE_CXXFLAGS="$CXXFLAGS"
@@ -102,6 +104,8 @@ SAVE_LDFLAGS="$LDFLAGS"
 SAVE_CXXLDFLAGS="$CXXLDFLAGS"
 CONF_COMMAND="$0 $ac_configure_args"
 AC_SUBST(CONF_COMMAND)
+AC_SUBST(SAVE_CC)
+AC_SUBST(SAVE_CXX)
 AC_SUBST(SAVE_ASFLAGS)
 AC_SUBST(SAVE_CFLAGS)
 AC_SUBST(SAVE_CXXFLAGS)
@@ -340,6 +344,7 @@ AC_SUBST(CC)
 AC_SUBST(CFLAGS)
 AC_SUBST(CXX)
 AC_SUBST(CXXFLAGS)
+AC_SUBST(ASFLAGS)
 AC_SUBST(LD)
 AC_SUBST(INSTALL_SCRIPT)
 
@@ -589,7 +594,7 @@ AC_SUBST(NOINST_LDFLAGS)
 
 if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
 then
-  tmp=`nm /usr/lib/libc.a  | grep _nss_files_getaliasent_r`
+  tmp=`nm /usr/lib*/libc.a  | grep _nss_files_getaliasent_r`
   if test -n "$tmp"
   then
      STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

mysql-test/mysql-test-run.pl

@@ -3751,6 +3751,13 @@ sub mysqld_arguments ($$$$) {
   # see BUG#28359
   mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
 
+  # When mysqld is run by a root user(euid is 0), it will fail
+  # to start unless we specify what user to run as. If not running
+  # as root it will be ignored, see BUG#30630
+  if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) {
+    mtr_add_arg($args, "%s--user=root");
+  }
+
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);

mysql-test/r/partition.result

@@ -33,11 +33,6 @@ call pz();
 call pz();
 drop procedure pz;
 drop table t1;
-create table t1 (a int)
-engine = csv
-partition by list (a)
-(partition p0 values in (null));
-ERROR HY000: Engine cannot be used in partitioned tables
 create table t1 (a bigint)
 partition by range (a)
 (partition p0 values less than (0xFFFFFFFFFFFFFFFF),
@@ -68,11 +63,6 @@ a
 18446744073709551614
 drop table t1;
 create table t1 (a int)
-engine = csv
-partition by list (a)
-(partition p0 values in (null));
-ERROR HY000: Engine cannot be used in partitioned tables
-create table t1 (a int)
 partition by key(a)
 (partition p0 engine = MEMORY);
 drop table t1;
@@ -319,18 +309,6 @@ analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 drop table t1;
-CREATE TABLE `t1` (
-`id` int(11) default NULL
-) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
-SELECT * FROM t1;
-id
-drop table t1;
-CREATE TABLE `t1` (
-`id` int(11) default NULL
-) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
-SELECT * FROM t1;
-id
-drop table t1;
 create table t1
 (a int)
 partition by range (a)
@@ -1050,18 +1028,6 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	note	The storage engine for the table doesn't support optimize
 drop table t1;
-create database db99;
-use db99;
-create table t1 (a int not null)
-engine=archive
-partition by list (a)
-(partition p0 values in (1), partition p1 values in (2));
-insert into t1 values (1), (2);
-create index inx on t1 (a);
-alter table t1 add partition (partition p2 values in (3));
-alter table t1 drop partition p2;
-use test;
-drop database db99;
 drop procedure if exists mysqltest_1;
 create table t1 (a int)
 partition by list (a)

mysql-test/r/partition_archive.result

+drop database if exists db99;
+create database db99;
+use db99;
+create table t1 (a int not null)
+engine=archive
+partition by list (a)
+(partition p0 values in (1), partition p1 values in (2));
+insert into t1 values (1), (2);
+create index inx on t1 (a);
+alter table t1 add partition (partition p2 values in (3));
+alter table t1 drop partition p2;
+use test;
+drop database db99;

mysql-test/r/partition_blackhole.result

+DROP TABLE IF EXISTS t1;
+CREATE TABLE `t1` (
+`id` int(11) default NULL
+) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
+SELECT * FROM t1;
+id
+DROP TABLE t1;

mysql-test/r/partition_csv.result

+drop table if exists t1;
+create table t1 (a int)
+engine = csv
+partition by list (a)
+(partition p0 values in (null));
+ERROR HY000: Engine cannot be used in partitioned tables
+USE mysql;
+SET GLOBAL general_log = 0;
+ALTER TABLE general_log ENGINE = MyISAM;
+ALTER TABLE general_log PARTITION BY RANGE (TO_DAYS(event_time))
+(PARTITION p0 VALUES LESS THAN (733144),
+PARTITION p1 VALUES LESS THAN (3000000));
+ERROR HY000: Incorrect usage of PARTITION and log table
+ALTER TABLE general_log ENGINE = CSV;
+SET GLOBAL general_log = 1;

mysql-test/suite/funcs_1/datadict/datadict_priv.inc

@@ -103,5 +103,8 @@ eval CREATE TABLE new_$table AS SELECT * FROM $table;
 --error ER_DBACCESS_DENIED_ERROR
 DROP DATABASE information_schema;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_PARSE_ERROR
 RENAME DATABASE information_schema TO info_schema;
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;

mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result

@@ -84,6 +84,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 ####################################################################################
 3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege):
@@ -149,6 +151,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 ####################################################################################
 4 Grant PROCESS privilege to ddicttestuser1

mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result

@@ -84,6 +84,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 ####################################################################################
 3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege):
@@ -149,6 +151,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 ####################################################################################
 4 Grant PROCESS privilege to ddicttestuser1

mysql-test/suite/funcs_1/r/innodb_trig_03e.result

@@ -571,10 +571,8 @@ test_yesprivs@localhost
 use priv_db;
 show triggers;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop trigger trg1_1;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
 select current_user;

mysql-test/suite/funcs_1/r/memory_trig_03e.result

@@ -571,10 +571,8 @@ test_yesprivs@localhost
 use priv_db;
 show triggers;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop trigger trg1_1;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
 select current_user;

mysql-test/suite/funcs_1/r/myisam_trig_03e.result

@@ -571,10 +571,8 @@ test_yesprivs@localhost
 use priv_db;
 show triggers;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop trigger trg1_1;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
 select current_user;

mysql-test/suite/funcs_1/r/ndb_cursors.result

@@ -75,7 +75,7 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
 
 NOT YET IMPLEMENTED: cursor tests

mysql-test/suite/funcs_1/r/ndb_trig_0102.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5.1.1:

mysql-test/suite/funcs_1/r/ndb_trig_03.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.3:

mysql-test/suite/funcs_1/r/ndb_trig_03e.result

@@ -571,10 +571,8 @@ test_yesprivs@localhost
 use priv_db;
 show triggers;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-trg1_1	INSERT	t1	set new.f1 = 'trig 1_1-yes'	BEFORE	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-NULL	priv_db	trg1_1	INSERT	NULL	priv_db	t1	0	NULL	set new.f1 = 'trig 1_1-yes'	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		test_yesprivs@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop trigger trg1_1;
 ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
 select current_user;

mysql-test/suite/funcs_1/r/ndb_trig_0407.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:

mysql-test/suite/funcs_1/r/ndb_trig_08.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:

mysql-test/suite/funcs_1/r/ndb_trig_09.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.9.1/2:

mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result

@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.10.1/2/3:

mysql-test/suite/funcs_1/t/disabled.def

@@ -13,3 +13,4 @@
 innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
 memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
 myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
+ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results

mysql-test/suite/funcs_2/r/innodb_charset.result

@@ -737,7 +737,6 @@ a_ascii	a_len
 44	1
 64	1
 45	1
-60	1
 65	1
 46	1
 66	1
@@ -779,17 +778,18 @@ a_ascii	a_len
 78	1
 59	1
 79	1
-7E	1
 5A	1
 7A	1
-5D	1
 5B	1
 5C	1
+5D	1
 5E	1
 5F	1
+60	1
 7B	1
 7C	1
 7D	1
+7E	1
 7F	1
 80	1
 81	1

mysql-test/suite/parts/r/partition_alter1_innodb.result

@@ -4,9 +4,6 @@ SET @@session.storage_engine = 'InnoDB';
 #------------------------------------------------------------------------
 # There are several testcases disabled because of the open bugs
 # #15890
-# The expected results suffer from the following bugs
-# harmless #17455, #19305
-# which cannot be suppressed because of technical reasons.
 #------------------------------------------------------------------------
 
 #------------------------------------------------------------------------
@@ -31,7 +28,7 @@ DROP TABLE IF EXISTS t0_definition;
 CREATE TABLE t0_definition (
 state CHAR(3),
 create_command VARBINARY(5000),
-file_list      VARBINARY(5000),
+file_list      VARBINARY(10000),
 PRIMARY KEY (state)
 ) ENGINE = MEMORY;
 DROP TABLE IF EXISTS t0_aux;

mysql-test/suite/rpl/t/rpl_innodb_bug28430.test

 --source include/have_innodb.inc
+--source include/have_partition.inc
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/master-slave.inc