Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  SCCS merged
mysql-test/r/binlog_stm_binlog.result:
  SCCS merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  SCCS merged
configure.in:
  manual merge
mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/t/mysqlbinlog2.test:
  manual merge
sql/mysqld.cc:
  manual merge

4 files changed, 15 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index 21f4920f12a..de0a9bbdeaa 100644
--- a/configure.in
+++ b/configure.in
@@ -734,6 +734,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
  sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
  unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \
  sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h \
+ sys/prctl.h \
  sys/resource.h sys/param.h port.h)
 
 AC_CHECK_HEADERS([xfs/xfs.h])
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
index 779ac122f93..e838acbed35 100644
--- a/mysql-test/extra/binlog_tests/binlog.test
+++ b/mysql-test/extra/binlog_tests/binlog.test
@@ -2,6 +2,7 @@
 # misc binlogging tests that do not require a slave running
 #
 
+-- source include/have_log_bin.inc
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 -- source include/have_log_bin.inc
diff --git a/mysql-test/extra/binlog_tests/drop_temp_table.test b/mysql-test/extra/binlog_tests/drop_temp_table.test
index 75e3afc9380..7d37fca2bef 100644
--- a/mysql-test/extra/binlog_tests/drop_temp_table.test
+++ b/mysql-test/extra/binlog_tests/drop_temp_table.test
@@ -1,5 +1,3 @@
---source include/have_log_bin.inc
-
 
 --disable_warnings
 drop database if exists `drop-temp+table-test`;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index caccc395eb5..8159f762dd5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -30,6 +30,10 @@
 
 #include "rpl_injector.h"
 
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #if defined(NOT_ENOUGH_TESTED) \
   && defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
@@ -1420,6 +1424,15 @@ static struct passwd *check_user(const char *user)
 err:
   sql_print_error("Fatal error: Can't change to run as user '%s' ;  Please check that the user exists!\n",user);
   unireg_abort(1);
+
+#ifdef PR_SET_DUMPABLE
+  if (test_flags & TEST_CORE_ON_SIGNAL)
+  {
+    /* inform kernel that process is dumpable */
+    (void) prctl(PR_SET_DUMPABLE, 1);
+  }
+#endif
+
 #endif
   return NULL;
 }