manual merge from mysql-trunk-bugfixing

Conflicts:
Text conflict in mysql-test/r/archive.result
Contents conflict in mysql-test/r/innodb_bug38231.result
Text conflict in mysql-test/r/mdl_sync.result
Text conflict in mysql-test/suite/binlog/t/disabled.def
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
Text conflict in mysql-test/t/archive.test
Contents conflict in mysql-test/t/innodb_bug38231.test
Text conflict in mysql-test/t/mdl_sync.test
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_show.cc
Text conflict in sql/table.cc
Text conflict in sql/table.h

1 files changed, 38 insertions, 0 deletions

diff --git a/mysys/my_mess.c b/mysys/my_mess.c
new file mode 100644
index 00000000000..0ec97525ae8
--- /dev/null
+++ b/mysys/my_mess.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 2000 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "mysys_priv.h"
+
+void my_message_stderr(uint error __attribute__((unused)),
+                       const char *str, myf MyFlags)
+{
+  DBUG_ENTER("my_message_stderr");
+  DBUG_PRINT("enter",("message: %s",str));
+  (void) fflush(stdout);
+  if (MyFlags & ME_BELL)
+#ifdef __NETWARE__
+    ringbell();                   				/* Bell */
+#else
+    (void) fputc('\007',stderr);				/* Bell */
+#endif /* __NETWARE__ */
+  if (my_progname)
+  {
+    (void)fputs(my_progname,stderr); (void)fputs(": ",stderr);
+  }
+  (void)fputs(str,stderr);
+  (void)fputc('\n',stderr);
+  (void)fflush(stderr);
+  DBUG_VOID_RETURN;
+}