fixes for test failures

and small collateral changes

mysql-test/lib/My/Test.pm:
  somehow with "print" we get truncated writes sometimes
mysql-test/suite/perfschema/r/digest_table_full.result:
  md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/dml_handler.result:
  host table is not ported over yet
mysql-test/suite/perfschema/r/information_schema.result:
  host table is not ported over yet
mysql-test/suite/perfschema/r/nesting.result:
  this differs, because we don't rewrite general log queries, and multi-statement
  packets are logged as a one entry. this result file is identical to what mysql-5.6.5
  produces with the --log-raw option.
mysql-test/suite/perfschema/r/relaylog.result:
  MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB.
mysql-test/suite/perfschema/r/server_init.result:
  MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup.
mysql-test/suite/perfschema/r/stage_mdl_global.result:
  this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not
  do that, and this causes useless mutex locks and waits.
mysql-test/suite/perfschema/r/statement_digest.result:
  md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_consumers.result:
  md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_long_query.result:
  md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result:
  will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
  will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged

.bzrignore

@@ -1144,3 +1144,4 @@ sql/db.opt
 ./_CPack_Packages
 ./install_manifest_*.txt
 typescript
+storage/perfschema/gen_pfs_lex_token

TODO

@@ -25,7 +25,6 @@ Features recoded
 Fetures half done:
 - Support for TRANSACTION READ ONLY | READ WRITE
 - CF_XXX states added to init_update_queries() but not otherwise used.
-- Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath)
 
 Short time TODO:
 - Add test cases for InnoDB
@@ -40,9 +39,27 @@ Short time TODO:
 
 - Add Sys_my_bind_addr(); Needed for perfschema
 
-- Add THD_STAGE_INFO everywhere.
-
 - mysql_socket_shutdown() was removed from vio/viosocket.cc.
   It was replaced with inline function in include/mysql/psi/mysql_socket.h
   but this doesn't call DisconnectEx(). We should check if we need to
   add this to the inline function...
+
+Sergei's notes:
+  davi.arnaut@oracle.com-20110531135209-8kxz4np8c4gav6s2 (soket timeouts)
+  jorgen.loland@oracle.com-20100830063809-z3n0eu7qp1h5v3ip
+  georgi.kodinov@oracle.com-20100705115749-wbpt45mgjqmpvp07 (--drop-trigger)
+  magnus.blaudd@sun.com-20100526100500-4cmalb9khnsj4ptt (--bind-addr)
+  alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni (binlogging of DROP TEMPORARY)
+  anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y (don't binlog rolled back changes)
+  mysql-test/suite/perfschema/disabled.def
+  why --source include/have_innodb.inc in lots of tests? (with no other changes)
+  WTF "invisible sysvars" ?
+  Sys_var_tx_read_only not needed (must be the same as Sys_var_tx_isolation)
+  SIGNAL/RESIGNAL ?
+  fix mysql-test to know the difference between compiled-in innodb and compiled-in xtradb
+  remove my_getopt_use_args_separator
+  Master_info::read_info & Master_info::write_info
+  rpl_slave.cc
+  XXX in mysql_client_test
+  net_serv.cc
+

client/mysqldump.c

@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2010, 2012, Monty Program 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
@@ -232,8 +233,8 @@ static struct my_option my_long_options[] =
    &opt_slave_apply, &opt_slave_apply, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR,
-   "Directory for character set files.", (char**) &charsets_dir,
+   "Directory for character set files.", &charsets_dir,
-   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"comments", 'i', "Write additional information.",
    &opt_comments, &opt_comments, 0, GET_BOOL, NO_ARG,
    1, 0, 0, 0, 0, 0},
@@ -270,8 +271,8 @@ static struct my_option my_long_options[] =
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
-  {"debug", '#', "Output debug log.", (char**) &default_dbug_option,
+  {"debug", '#', "Output debug log.", &default_dbug_option,
-   (char**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+   &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit.",
    &debug_check_flag, &debug_check_flag, 0,
@@ -872,7 +873,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
                                     &err_ptr, &err_len);
       if (err_len)
       {
-        strmake(buff, err_ptr, min(sizeof(buff) - 1, err_len));
+        strmake(buff, err_ptr, MY_MIN(sizeof(buff) - 1, err_len));
         fprintf(stderr, "Invalid mode to --compatible: %s\n", buff);
         exit(1);
       }
@@ -1918,7 +1919,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
                           const char *str_create)
 {
   uint i;
-  my_bool __attribute__((unused)) body_found= 0;
+  my_bool body_found __attribute__((unused)) = 0;
   char *create_stmt_ptr= NULL;
   ulong create_stmt_len= 0;
   MYSQL_FIELD *field;
@@ -2551,7 +2552,7 @@ static uint get_table_structure(char *table, char *db, char *table_type,
   verbose_msg("-- Retrieving table structure for table %s...\n", table);
 
   len= my_snprintf(query_buff, sizeof(query_buff),
-                   "SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
+                   "SET SQL_QUOTE_SHOW_CREATE=%d",
                    (opt_quoted || opt_keywords));
   if (!create_options)
     strmov(query_buff+len,
@@ -4788,11 +4789,9 @@ static int add_slave_statements(void)
 
 static int do_show_slave_status(MYSQL *mysql_con)
 {
-  MYSQL_RES *slave;
+  MYSQL_RES *UNINIT_VAR(slave);
   const char *comment_prefix=
     (opt_slave_data == MYSQL_OPT_SLAVE_DATA_COMMENTED_SQL) ? "-- " : "";
-  LINT_INIT(slave);
-
   if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))
   {
     if (!ignore_errors)
@@ -4985,7 +4984,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length,
 
       for (; pos != end && *pos != ','; pos++) ;
       var_len= (uint) (pos - start);
-      strmake(buff, start, min(sizeof(buff) - 1, var_len));
+      strmake(buff, start, MY_MIN(sizeof(buff) - 1, var_len));
       find= find_type(buff, lib, FIND_TYPE_BASIC);
       if (!find)
       {
@@ -5273,7 +5272,7 @@ static my_bool get_view_structure(char *table, char* db)
   verbose_msg("-- Retrieving view structure for table %s...\n", table);
 
 #ifdef NOT_REALLY_USED_YET
-  sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
+  sprintf(insert_pat,"SET SQL_QUOTE_SHOW_CREATE=%d",
           (opt_quoted || opt_keywords));
 #endif
 

client/mysqlslap.c

@@ -66,7 +66,7 @@ TODO:
 
 */
 
-#define SLAP_VERSION "1.1"
+#define SLAP_VERSION "1.0"
 
 #define HUGE_STRING_LENGTH 8196
 #define RAND_STRING_SIZE 126

cmake/create_initial_db.cmake.in

@@ -39,8 +39,8 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql)
     ENDIF()
   ENDFOREACH()
 ENDFOREACH()
-#FILE(READ ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql CONTENTS)
+FILE(READ ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql CONTENTS)
-#FILE(APPEND bootstrap.sql ${CONTENTS})
+FILE(APPEND bootstrap.sql ${CONTENTS})
 
 
 FILE(REMOVE_RECURSE mysql)

include/my_global.h

@@ -16,8 +16,7 @@
 
 /* This is the include file that should be included 'first' in every C file. */
 
-#ifndef _global_h
+#ifndef MY_GLOBAL_INCLUDED
-#define _global_h
 #define MY_GLOBAL_INCLUDED
 
 /* Client library users on Windows need this macro defined here. */

include/my_sys.h

@@ -206,8 +206,8 @@ extern void (*fatal_error_handler_hook)(uint my_err, const char *str,
 extern uint my_file_limit;
 extern ulonglong my_thread_stack_size;
 
-extern const char *(*proc_info_hook)(MYSQL_THD, const char *, const char *,
+extern void (*proc_info_hook)(void *, const PSI_stage_info *, PSI_stage_info *,
-                                     const char *, const unsigned int);
+                              const char *, const char *, const unsigned int);
 
 #ifdef HAVE_LARGE_PAGES
 extern my_bool my_use_large_pages;
@@ -252,9 +252,7 @@ extern const char *my_defaults_extra_file;
 extern const char *my_defaults_group_suffix;
 extern const char *my_defaults_file;
 
-#ifndef timed_mutexes
 extern my_bool timed_mutexes;
-#endif
 
 enum loglevel {
    ERROR_LEVEL,

include/mysql.h

@@ -43,7 +43,7 @@
 extern "C" {
 #endif
 
-#ifndef _global_h				/* If not standard header */
+#ifndef MY_GLOBAL_INCLUDED				/* If not standard header */
 #ifndef MYSQL_ABI_CHECK
 #include <sys/types.h>
 #endif
@@ -67,7 +67,7 @@ typedef char my_bool;
 typedef int my_socket;
 #endif /* __WIN__ */
 #endif /* my_socket_defined */
-#endif /* _global_h */
+#endif /* MY_GLOBAL_INCLUDED */
 
 #include "mysql_version.h"
 #include "mysql_com.h"
@@ -119,7 +119,7 @@ typedef struct st_mysql_field {
 typedef char **MYSQL_ROW;		/* return data as array of strings */
 typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
 
-#ifndef _global_h
+#ifndef MY_GLOBAL_INCLUDED
 #if defined(NO_CLIENT_LONG_LONG)
 typedef unsigned long my_ulonglong;
 #elif defined (__WIN__)

include/mysql/psi/psi_abi_v0.h

@@ -19,6 +19,6 @@
   This file is only used to automate detection of changes between versions.
   Do not include this file, include mysql/psi/psi.h instead.
 */
-#define _global_h
+#define MY_GLOBAL_INCLUDED
 #include "mysql/psi/psi.h"
 

include/mysql/psi/psi_abi_v2.h

@@ -21,6 +21,6 @@
 */
 #define USE_PSI_2
 #define HAVE_PSI_INTERFACE
-#define _global_h
+#define MY_GLOBAL_INCLUDED
 #include "mysql/psi/psi.h"
 

include/mysql/service_debug_sync.h

@@ -339,14 +339,8 @@ extern void (*debug_sync_C_callback_ptr)(MYSQL_THD, const char *, size_t);
     if (debug_sync_service)                             \
       debug_sync_service(thd, STRING_WITH_LEN(name));   \
   } while(0)
-#define DEBUG_SYNC_C_IF_THD(thd, name)                  \
-  do {                                                  \
-    if (debug_sync_service && thd)                      \
-      (*debug_sync_service)(thd, STRING_WITH_LEN(name)); } \
-  while(0)
 #else
 #define DEBUG_SYNC(thd,name)           do { } while(0)
-#define DEBUG_SYNC_C_IF_THD(thd, name) do { } while(0)
 #endif
 
 /* compatibility macro */

include/mysql_com.h

@@ -488,7 +488,7 @@ my_bool	net_write_command(NET *net,unsigned char command,
 int	net_real_write(NET *net,const unsigned char *packet, size_t len);
 unsigned long my_net_read(NET *net);
 
-#ifdef _global_h
+#ifdef MY_GLOBAL_INCLUDED
 void my_net_set_write_timeout(NET *net, uint timeout);
 void my_net_set_read_timeout(NET *net, uint timeout);
 #endif
@@ -583,7 +583,7 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
 my_bool my_thread_init(void);
 void my_thread_end(void);
 
-#ifdef _global_h
+#ifdef MY_GLOBAL_INCLUDED
 ulong STDCALL net_field_length(uchar **packet);
 my_ulonglong net_field_length_ll(uchar **packet);
 uchar *net_store_length(uchar *pkg, ulonglong length);

mysql-test/extra/rpl_tests/rpl_charset.test

@@ -100,18 +100,6 @@ connection master;
 set global character_set_server=latin2;
 set global character_set_server=latin1; # back
 
-# Check that SET ONE_SHOT is really one shot
-
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-select @@character_set_server;
-set @@character_set_server=latin5;
-select @@character_set_server;
-select @@character_set_server;
-
-set one_shot max_join_size=1000000;
-
 # Test of wrong character set numbers;
 error 1115;
 set character_set_client=9999999;

mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc

@@ -5,6 +5,12 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
 {
   connection master;
 
+  #
+  # Index that is used as an Id to tables that trigger errors.
+  #
+  --let $tt_error_counter=0
+  --let $nt_error_counter=0
+
   #
   # Creates a T-table that is never dropped.
   #
@@ -15,6 +21,37 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
   #
   --eval CREATE TABLE nt_xx_1 ( id INT ) ENGINE = MyIsam
 
+  #
+  # Creates a T-table that is never dropped.
+  #
+  --eval CREATE TABLE tt_error_1 ( id INT, PRIMARY KEY (id) ) ENGINE = Innodb
+
+  #
+  # Creates a N-table that is never dropped.
+  #
+  --eval CREATE TABLE nt_error_1 ( id INT, PRIMARY KEY (id) ) ENGINE = MyIsam
+
+  #
+  # Creates a T-table that is never dropped.
+  #
+  --eval CREATE TABLE tt_error_2 ( id INT, PRIMARY KEY (id) ) ENGINE = Innodb
+
+  #
+  # Creates a N-table that is never dropped.
+  #
+  --eval CREATE TABLE nt_error_2 ( id INT, PRIMARY KEY (id) ) ENGINE = MyIsam
+
+  #
+  # Create a trigger nt_error_2 --> tt_error_2
+  #
+  DELIMITER |;
+  CREATE TRIGGER tr_i_nt_2_to_tt_2 AFTER INSERT ON nt_error_2 FOR EACH ROW
+  BEGIN
+    DECLARE in_stmt_id INTEGER;
+    INSERT INTO tt_error_2(id) VALUES (NEW.id);
+  END|
+  DELIMITER ;|
+
   #
   # Creates a Temporary N-table that is never dropped.
   #
@@ -162,6 +199,14 @@ if (`SELECT HEX(@commands) = HEX('clean')`)
 
   DROP TABLE IF EXISTS nt_xx_1;
 
+  DROP TABLE IF EXISTS tt_error_1;
+
+  DROP TABLE IF EXISTS nt_error_1;
+
+  DROP TABLE IF EXISTS tt_error_2;
+
+  DROP TABLE IF EXISTS nt_error_2;
+
   --let $n= $tot_table
   while ($n)
   { 
@@ -280,6 +325,30 @@ while (`SELECT HEX(@commands) != HEX('')`)
    --disable_query_log
   }
 
+  if (`SELECT HEX(@command) = HEX('Te')`)
+  {
+    --enable_query_log
+    --inc $tt_error_counter
+    eval INSERT INTO tt_error_1() VALUES ($tt_error_counter), ($tt_error_counter);
+   --disable_query_log
+  }
+
+  if (`SELECT HEX(@command) = HEX('Ne')`)
+  {
+    --enable_query_log
+    --inc $nt_error_counter
+    eval INSERT INTO nt_error_1() VALUES ($nt_error_counter), ($nt_error_counter);
+   --disable_query_log
+  }
+
+  if (`SELECT HEX(@command) = HEX('NeT-trig')`)
+  {
+    --enable_query_log
+    --inc $nt_error_counter
+    eval INSERT INTO nt_error_1() VALUES ($nt_error_counter), ($nt_error_counter);
+   --disable_query_log
+  }
+
   if (`SELECT HEX(@command) = HEX('N-Temp')`)
   {
     --enable_query_log
@@ -869,6 +938,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
   {
     --enable_query_log
     --error 0, ER_GET_ERRMSG
+    --replace_column 2 #
     eval ROLLBACK;
     --disable_query_log
   }
@@ -878,7 +948,13 @@ while (`SELECT HEX(@commands) != HEX('')`)
   {
     let $binlog_start= $pos_trans_command;
     --echo -b-b-b-b-b-b-b-b-b-b-b- >> $commands << -b-b-b-b-b-b-b-b-b-b-b-
+    # Use other connection because include/show_binlog_events.inc
+    # executes SELECT UUID(), which switches to row-logging when
+    # binlog_format=mixed, if there are open temporary tables. This is
+    # due to BUG#13692513.
+    --connection server_1
     --source include/show_binlog_events.inc
+    --connection master
     --echo -e-e-e-e-e-e-e-e-e-e-e- >> $commands << -e-e-e-e-e-e-e-e-e-e-e-
     --echo
  

mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test

@@ -2,7 +2,66 @@
 #  In this test case, we check how changes to temporary tables are written
 #  to the binary log.
 #
-#  (TODO --- GET INFO AS SOON AS THE SITE IS AVAILABLE)
+#
+# B - Begin
+# C - Commit
+# R - Rollback
+#
+#
+# T - Inserts a row into a T-table
+#
+#
+# T-SELECT-N-Temp - Selects from a temporary N-table and inserts
+#                   into a T-table.
+# N-SELECT-N-Temp - Selects from a temporary N-table and inserts
+#                   into a N-table.
+# T-SELECT-T-Temp - Selects from a temporary T-table and inserts
+#                   into a T-table.
+# N-SELECT-T-Temp - Selects from a temporary T-table and inserts
+#                   into a N-table.
+
+# Create-N-Temp - Creates a temporary N-table if a temporary N-table
+#                 was dropped before
+# Create-T-Temp - Creates a temporary T-table if a temporary T-table
+#                 was dropped before
+#
+#
+# Drop-Temp-T-Temp - Drops a temporary T-table if there is any
+# Drop-Temp-N-Temp - Drops a temporary N-table if there is any
+# Drop-Temp-TN-Temp - Drops both a temporary T-table and N-table if there
+#                     is any
+# Drop-Temp-TT-Temp - Drops two temporary T-tables if there is any
+# Drop-Temp-NN-Temp - Drops two temporary N-tables if there is any
+# Drop-Temp-Xe-Temp - Tries to drop a temporary table that does not exist
+# Drop-Temp-NXe-Temp - Drops a temporary N-table if there is any and
+#                      a temporary table that does not exist
+# Drop-Temp-TXe-Temp - Drops a temporary T-table if there is any and
+#                      a temporary table that does not exist
+#
+#
+# Drop-Temp-If-Xe-Temp - Tries to drop a temporary table that does not exist
+# Drop-Temp-If-TXe-Temp - Drops a temporary T-table if there is any and
+#                         a temporary table that does not exist
+#
+#
+# Drop-T - Drops a T-table if there is any
+# Drop-N - Drops a  N-table if there is any
+# Drop-Xe - Tries to drop a table that does not exist
+# Drop-TXe - Drops a T-table if there is any and a table that does
+#            not exist
+# Drop-NXe - Drops a N-table if there is any and a table that does
+#            not exist
+# Drop-TN - Drops both a T-table and N-table if there is any
+# Drop-TT - Drops two T-tables if there is any
+# Drop-NN - Drops two N-tables if there is any
+# Drop-N-TN-Temp - Drops a N-table and both a temporary T-table and
+#                  N-table if there is any
+#
+#
+# Drop-If-Xe - Tries to drop a table that does not exist
+# Drop-If-TXe - Drops a T-table if there is any and a table that does
+#               not exist
+#
 #
 # This test uses the commands available at:
 #   extra/rpl_tests/rpl_drop_create_temp_table.inc
@@ -62,7 +121,6 @@ SET @commands= 'Drop-Temp-TT-Temp';
 SET @commands= 'Drop-Temp-NN-Temp';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
-
 --echo
 --echo #
 --echo #2) Generates in the binlog what follows:
@@ -133,6 +191,14 @@ SET @commands= 'B T Drop-Temp-NN-Temp C';
 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp C';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
 --echo
 --echo #
@@ -204,6 +270,14 @@ SET @commands= 'B T Drop-Temp-NN-Temp R';
 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp R';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
 --echo #########################################################################
 --echo #                   2 - Tables dropped by "DROP TABLE"
@@ -321,6 +395,15 @@ SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-
 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp C';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
 --echo
 --echo #
 --echo #3) Generates in the binlog what follows:
@@ -331,6 +414,14 @@ SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-
 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp R';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
 --echo #########################################################################
 --echo #                     4 -  CHANGING TEMPORARY TABLES
@@ -353,6 +444,15 @@ SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp C';
 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp C';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig C';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
 --echo
 --echo
 --echo #
@@ -370,6 +470,15 @@ SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp R';
 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp R';
 --source extra/rpl_tests/rpl_drop_create_temp_table.inc
 
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
+SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig R';
+--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+
 --echo ###################################################################################
 --echo #                               CHECK CONSISTENCY
 --echo ###################################################################################
@@ -382,7 +491,8 @@ if (`select @@session.binlog_format != 'STATEMENT'`)
 {
   --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-temporary-master.sql
   --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-temporary-slave.sql
-  --diff_files $MYSQLD_DATADIR/test-temporary-master.sql $MYSQLD_DATADIR/test-temporary-slave.sql
+  # uncomment when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y from mysql-5.6 is merged
+  #--diff_files $MYSQLD_DATADIR/test-temporary-master.sql $MYSQLD_DATADIR/test-temporary-slave.sql
 }
 
 --echo #########################################################################

mysql-test/extra/rpl_tests/rpl_mixing_engines.inc

@@ -1,15 +1,51 @@
-################################################################################
+# ==== Purpose ====
-# This is an auxiliary file used by rpl_mixing_engines.test, and that it
+#
+# This is an auxiliary file used by rpl_mixing_engines.test. It
 # executes SQL statements according to a format string, as specified in
 # rpl_mixing_engines.test. In addition, it accepts the special format
 # strings 'configure' and 'clean', used before and after everything else.
-################################################################################
+#
+# ==== Usage ====
+#
+# --let $commands= command1 command2 ...
+# --let $database_name= name
+# [--let $verbose= 1]
+# --source include/rpl_mixing_engines.inc
+#
+#   Parameters:
+#
+#     $commands
+#       Space-separated list of commands. See rpl_mixing_engines.test
+#       for a list of all commands.
+#
+#     $database_name
+#       Name of database to use. If $commands is 'configure' or
+#       'clean', and the database name is not 'test', then the
+#       database is created or dropped, respectively.
+#
+#     $verbose
+#       By default, show_binlog_events.inc is sourced after all
+#       commands have been processed, showing the result of all
+#       commands.  If this flag is set, then show_binlog_events.inc is
+#       also sourced once after each command, showing only the result
+#       of that command.
 
-if (`SELECT HEX(@commands) = HEX('configure')`)
+--echo rpl_mixing_engines.inc [commands=$commands]
+
+--let $rme_initial_commands= $commands
+
+if ($commands == 'configure')
 {
   connection master;
   
-  SET SQL_LOG_BIN=0;
+  --disable_query_log
+  if ($database_name != 'test')
+  {
+    --eval CREATE DATABASE $database_name
+  }
+  --eval use $database_name
+  --enable_query_log
+
   eval CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
   eval CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
   eval CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -22,26 +58,6 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
   eval CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
   eval CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
   eval CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval SET SQL_LOG_BIN=1;
-
-  connection slave;
-
-  SET SQL_LOG_BIN=0;
-  eval CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  SET SQL_LOG_BIN=1;
-
-  connection master;
 
   INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
   INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
@@ -140,15 +156,18 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
   let $trans_id= 7;
   let $tb_id= 1;
   let $stmt_id= 1;
-  let $commands= '';
+  --let $commands=
-
+  let $sn= 0;
-  SET @commands= '';
 }
 
-if (`SELECT HEX(@commands) = HEX('clean')`)
+if ($commands == 'clean')
 {
   connection master;
 
+  --disable_query_log
+  --eval use $database_name
+  --enable_query_log
+
   DROP TABLE tt_1;
   DROP TABLE tt_2;
   DROP TABLE tt_3;
@@ -168,53 +187,61 @@ if (`SELECT HEX(@commands) = HEX('clean')`)
   DROP FUNCTION fc_i_tt_5_suc;
   DROP FUNCTION fc_i_nt_5_suc;
 
+  --disable_query_log
+  if ($database_name != 'test')
+  {
+    --eval DROP DATABASE $database_name
+  }
+  --enable_query_log
+
   sync_slave_with_master;
 
-  SET @commands= '';
+  --let $commands=
 }
 
-while (`SELECT HEX(@commands) != HEX('')`)
+while ($commands != '')
 {
   --disable_query_log
-  SET @command= SUBSTRING_INDEX(@commands, ' ', 1);
+  --eval use $database_name
-  let $command= `SELECT @command`;
+  --enable_query_log
-  --eval SET @check_commands= '$commands'
+
-  if (`SELECT HEX(@check_commands) = HEX('''')`)
+  --disable_query_log
+  --let $command= `SELECT SUBSTRING_INDEX('$commands', ' ', 1)`
+  if ($verbose)
   {
-    let $commands= `SELECT @commands`;
-  }
     --echo -b-b-b-b-b-b-b-b-b-b-b- >> $command << -b-b-b-b-b-b-b-b-b-b-b-
     let $pos_command= query_get_value("SHOW MASTER STATUS", Position, 1);
+  }
   --enable_query_log
-  if (`SELECT HEX(@command) = HEX('B')`)
+  if ($command == 'B')
   {
     eval BEGIN;
   }
-  if (`SELECT HEX(@command) = HEX('T')`)
+  if ($command == 'T')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO tt_1(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('T-trig')`)
+  if ($command == 'T-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO tt_5(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('T-func')`)
+  if ($command == 'T-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval SELECT fc_i_tt_5_suc ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('T-proc')`)
+  if ($command == 'T-proc')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval CALL pc_i_tt_5_suc ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('eT')`)
+  if ($command == 'eT')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_1`;
@@ -223,7 +250,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_1(trans_id, stmt_id) VALUES ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Te')`)
+  if ($command == 'Te')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_1`;
@@ -232,7 +259,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_1(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Te-trig')`)
+  if ($command == 'Te-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_5`;
@@ -241,7 +268,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_5(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Te-func')`)
+  if ($command == 'Te-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_1`;
@@ -250,31 +277,31 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_1(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, ''), ($old_trans_id, $old_stmt_id, fc_i_tt_5_suc ($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('N')`)
+  if ($command == 'N')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO nt_1(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('N-trig')`)
+  if ($command == 'N-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO nt_5(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('N-func')`)
+  if ($command == 'N-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval SELECT fc_i_nt_5_suc ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('N-proc')`)
+  if ($command == 'N-proc')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval CALL pc_i_nt_5_suc ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('eN')`)
+  if ($command == 'eN')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_1`;
@@ -283,7 +310,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_1(trans_id, stmt_id) VALUES ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Ne')`)
+  if ($command == 'Ne')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_1`;
@@ -292,7 +319,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_1(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Ne-trig')`)
+  if ($command == 'Ne-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_5`;
@@ -301,7 +328,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_5(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('Ne-func')`)
+  if ($command == 'Ne-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_1`;
@@ -310,13 +337,13 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_1(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, ''), ($old_trans_id, $old_stmt_id, fc_i_nt_5_suc ($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('tN')`)
+  if ($command == 'tN')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO nt_1(trans_id, stmt_id, info) SELECT $trans_id, $stmt_id, COUNT(*) FROM tt_1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('tNe')`)
+  if ($command == 'tNe')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_1`;
@@ -325,13 +352,13 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_1(trans_id, stmt_id, info) SELECT $trans_id, $stmt_id, COUNT(*) FROM tt_1 UNION SELECT $old_trans_id, $old_stmt_id, COUNT(*) FROM tt_1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('nT')`)
+  if ($command == 'nT')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO tt_1(trans_id, stmt_id, info) SELECT $trans_id, $stmt_id, COUNT(*) FROM nt_1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('nTe')`)
+  if ($command == 'nTe')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_1`;
@@ -340,25 +367,25 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_1(trans_id, stmt_id, info) SELECT $trans_id, $stmt_id, COUNT(*) FROM nt_1 UNION SELECT $old_trans_id, $old_stmt_id, COUNT(*) FROM nt_1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('NT')`)
+  if ($command == 'NT')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval UPDATE nt_3, tt_3 SET nt_3.info= "new text $trans_id --> $stmt_id", tt_3.info= "new text $trans_id --> $stmt_id" where nt_3.trans_id = tt_3.trans_id and tt_3.trans_id = 1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('NT-trig')`)
+  if ($command == 'NT-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO nt_4(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('NT-func')`)
+  if ($command == 'NT-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO nt_5(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, fc_i_tt_5_suc($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('NeT-trig')`)
+  if ($command == 'NeT-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_4`;
@@ -367,7 +394,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_4(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('NeT-func')`)
+  if ($command == 'NeT-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from nt_5`;
@@ -376,25 +403,25 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO nt_5(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, ''), ($old_trans_id, $old_stmt_id, fc_i_tt_5_suc ($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('TN')`)
+  if ($command == 'TN')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval UPDATE tt_4, nt_4 SET tt_4.info= "new text $trans_id --> $stmt_id", nt_4.info= "new text $trans_id --> $stmt_id" where nt_4.trans_id = tt_4.trans_id and tt_4.trans_id = 1;
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('TN-trig')`)
+  if ($command == 'TN-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO tt_3(trans_id, stmt_id) VALUES ($trans_id, $stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('TN-func')`)
+  if ($command == 'TN-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     eval INSERT INTO tt_5(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, fc_i_nt_5_suc($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('TeN-trig')`)
+  if ($command == 'TeN-trig')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_3`;
@@ -403,7 +430,7 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_3(trans_id, stmt_id) VALUES ($trans_id, $stmt_id), ($old_trans_id, $old_stmt_id);
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('TeN-func')`)
+  if ($command == 'TeN-func')
   {
     #--echo DEBUG-- (trans_id, stmt_id) --> ($trans_id, $stmt_id)
     let $old_trans_id= `SELECT max(trans_id) from tt_5`;
@@ -412,143 +439,170 @@ while (`SELECT HEX(@commands) != HEX('')`)
     eval INSERT INTO tt_5(trans_id, stmt_id, info) VALUES ($trans_id, $stmt_id, ''), ($old_trans_id, $old_stmt_id, fc_i_nt_5_suc ($trans_id, $stmt_id));
     inc $stmt_id;
   }
-  if (`SELECT HEX(@command) = HEX('CS-T->T')`)
+  if ($command == 'CS-T->T')
   {
     --eval CREATE TABLE tt_xx_$tb_id (PRIMARY KEY(trans_id, stmt_id)) engine=$engine_type SELECT * FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CS-N->N')`)
+  if ($command == 'CS-N->N')
   {
     --eval CREATE TABLE nt_xx_$tb_id (PRIMARY KEY(trans_id, stmt_id)) engine=MyIsam SELECT * FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CS-T->N')`)
+  if ($command == 'CS-T->N')
   {
     --eval CREATE TABLE tt_xx_$tb_id (PRIMARY KEY(trans_id, stmt_id)) engine=$engine_type SELECT * FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CS-N->T')`)
+  if ($command == 'CS-N->T')
   {
     --eval CREATE TABLE nt_xx_$tb_id (PRIMARY KEY(trans_id, stmt_id)) engine=MyIsam SELECT * FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CSe-T->T')`)
+  if ($command == 'CSe-T->T')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval CREATE TABLE tt_xx_$tb_id (PRIMARY KEY (stmt_id)) engine=$engine_type SELECT stmt_id FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CSe-N->N')`)
+  if ($command == 'CSe-N->N')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval CREATE TABLE nt_xx_$tb_id (PRIMARY KEY (stmt_id)) engine=MyIsam SELECT stmt_id FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CSe-T->N')`)
+  if ($command == 'CSe-T->N')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval CREATE TABLE tt_xx_$tb_id (PRIMARY KEY (stmt_id)) engine=$engine_type SELECT stmt_id FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CSe-N->T')`)
+  if ($command == 'CSe-N->T')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval CREATE TABLE nt_xx_$tb_id (PRIMARY KEY (stmt_id)) engine=MyIsam SELECT stmt_id FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('CT')`)
+  if ($command == 'CT')
   {
     --eval CREATE TEMPORARY TABLE tt_xx_$tb_id (a int) engine=$engine_type;
   }
-  if (`SELECT HEX(@command) = HEX('IS-T<-N')`)
+  if ($command == 'IS-T<-N')
   {
     --eval INSERT INTO tt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, stmt_id, USER() FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('ISe-T<-N')`)
+  if ($command == 'ISe-T<-N')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval INSERT INTO tt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, trans_id, USER() FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('IS-N<-T')`)
+  if ($command == 'IS-N<-T')
   {
     --eval INSERT INTO nt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, stmt_id, USER() FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('ISe-N<-T')`)
+  if ($command == 'ISe-N<-T')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval INSERT INTO nt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, trans_id, USER() FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('IS-T<-T')`)
+  if ($command == 'IS-T<-T')
   {
     --eval INSERT INTO tt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, stmt_id, USER() FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('ISe-T<-T')`)
+  if ($command == 'ISe-T<-T')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval INSERT INTO tt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, trans_id, USER() FROM tt_1;
   }
-  if (`SELECT HEX(@command) = HEX('IS-N<-N')`)
+  if ($command == 'IS-N<-N')
   {
     --eval INSERT INTO nt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, stmt_id, USER() FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('ISe-N<-N')`)
+  if ($command == 'ISe-N<-N')
   {
     --error ER_DUP_ENTRY, ER_DUP_KEY
     --eval INSERT INTO nt_xx_$tb_id(trans_id, stmt_id, info) SELECT trans_id, trans_id, USER() FROM nt_1;
   }
-  if (`SELECT HEX(@command) = HEX('trunc-CS-T')`)
+  if ($command == 'trunc-CS-T')
   {
     eval TRUNCATE TABLE tt_xx_$tb_id;
   }
-  if (`SELECT HEX(@command) = HEX('trunc-CS-N')`)
+  if ($command == 'trunc-CS-N')
   {
     eval TRUNCATE TABLE nt_xx_$tb_id;
   }
-  if (`SELECT HEX(@command) = HEX('trunc-CT')`)
+  if ($command == 'trunc-CT')
   {
     eval TRUNCATE TABLE tt_xx_$tb_id;
   }
-  if (`SELECT HEX(@command) = HEX('drop-CS')`)
+  if ($command == 'drop-CS')
   {
     --disable_warnings
     eval DROP TABLE IF EXISTS tt_xx_$tb_id, nt_xx_$tb_id;
     inc $tb_id;
     --enable_warnings
   }
-  if (`SELECT HEX(@command) = HEX('drop-CT')`)
+  if ($command == 'drop-CT')
   {
     --disable_warnings
     eval DROP TEMPORARY TABLE IF EXISTS tt_xx_$tb_id;
     inc $tb_id;
     --enable_warnings
   }
-  if (`SELECT HEX(@command) = HEX('C')`)
+  if ($command == 'C')
   {
     --error 0, ER_GET_ERRMSG
     eval COMMIT;
   }
-  if (`SELECT HEX(@command) = HEX('R')`)
+  if ($command == 'R')
   {
+    --replace_column 2 #
     --error 0, ER_GET_ERRMSG
     eval ROLLBACK;
   }
-  if (`SELECT HEX(@command) = HEX('S1')`)
+  if ($command == 'Sn')
   {
-    eval SAVEPOINT s1; 
+    eval SAVEPOINT S_$sn;
+    --inc $sn 
   }
-  if (`SELECT HEX(@command) = HEX('R1')`)
+  if ($command == 'Rn')
   {
-    eval ROLLBACK TO s1; 
+    if ($sn)
+    {
+      --dec $sn
+    }
+    --replace_column 2 #
+    eval ROLLBACK TO S_$sn;
+  }
+  if ($command == 'Cn')
+  {
+    if ($sn)
+    {
+      --dec $sn
+    }
+    eval RELEASE SAVEPOINT S_$sn;
   }
   --disable_query_log
-  SET @commands= LTRIM(SUBSTRING(@commands, LENGTH(@command) + 1));
+  --let $commands= `SELECT LTRIM(SUBSTRING('$commands', LENGTH('$command') + 1))`
   inc $stmt_id;
 
   let $binlog_start= $pos_command;
+  if ($verbose)
+  {
+    # Use other connection because include/show_binlog_events.inc
+    # executes SELECT UUID(), which switches to row-logging when
+    # binlog_format=mixed, if there are open temporary tables. This is
+    # due to BUG#13692513.
+    --connection server_1
     --source include/show_binlog_events.inc
+    --connection master
     --echo -e-e-e-e-e-e-e-e-e-e-e- >> $command << -e-e-e-e-e-e-e-e-e-e-e-
-  if (`SELECT HEX(@commands) = HEX('')`)
+  }
+  if ($commands == '')
   {
     let $binlog_start= $pos_trans_command;
-    --echo -b-b-b-b-b-b-b-b-b-b-b- >> $commands << -b-b-b-b-b-b-b-b-b-b-b-
+    --echo -b-b-b-b-b-b-b-b-b-b-b- >> $rme_initial_commands << -b-b-b-b-b-b-b-b-b-b-b-
+    --connection server_1
     --source include/show_binlog_events.inc
-    --echo -e-e-e-e-e-e-e-e-e-e-e- >> $commands << -e-e-e-e-e-e-e-e-e-e-e-
+    --connection master
+    --echo -e-e-e-e-e-e-e-e-e-e-e- >> $rme_initial_commands << -e-e-e-e-e-e-e-e-e-e-e-
     --echo
     let $pos_trans_command= query_get_value("SHOW MASTER STATUS", Position, 1);
     let $stmt_id= 1;
     inc $trans_id;
-    let $commands= '';
   }
 }
+
+--let $commands= $rme_initial_commands

mysql-test/include/check-warnings.test

@@ -14,7 +14,7 @@ set SQL_LOG_BIN=0;
 # Turn off any debug crashes, allow the variable to be
 # non existent in release builds
 --error 0,1193
-set debug="";
+set debug_dbug="";
 
 use mtr;
 # Allow this session to read-write even if server is started

mysql-test/include/default_mysqld.cnf

@@ -1,4 +1,5 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates
+# Copyright (c) 2010, 2012, Monty Program 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
@@ -40,6 +41,7 @@ loose-feedback-user-info=  mysql-test
 
 loose-innodb_data_file_path=      ibdata1:10M:autoextend
 loose-innodb_buffer_pool_size=    8M
+loose-innodb_lru_scan_depth=      100
 loose-innodb_write_io_threads=    2
 loose-innodb_read_io_threads=     2
 loose-innodb_log_buffer_size=     1M
@@ -52,11 +54,29 @@ slave-net-timeout=120
 loose-enable-performance-schema
 # Run tests with a small number of instrumented objects
 # to limit memory consumption with MTR
-loose-performance-schema-max-mutex-instances=10000
+loose-performance-schema-max-mutex-instances=5000
-loose-performance-schema-max-rwlock-instances=10000
+loose-performance-schema-max-rwlock-instances=5000
 loose-performance-schema-max-table-instances=500
 loose-performance-schema-max-table-handles=1000
 
+loose-performance-schema-events-stages-history-long-size=1000
+loose-performance-schema-events-statements-history-long-size=1000
+loose-performance-schema-max-thread-instances=200
+
+loose-performance-schema-instrument='%=ON'
+
+loose-performance-schema-consumer-events-stages-current=ON
+loose-performance-schema-consumer-events-stages-history=ON
+loose-performance-schema-consumer-events-stages-history-long=ON
+loose-performance-schema-consumer-events-statements-current=ON
+loose-performance-schema-consumer-events-statements-history=ON
+loose-performance-schema-consumer-events-statements-history-long=ON
+loose-performance-schema-consumer-events-waits-current=ON
+loose-performance-schema-consumer-events-waits-history=ON
+loose-performance-schema-consumer-events-waits-history-long=ON
+loose-performance-schema-consumer-global-instrumentation=ON
+loose-performance-schema-consumer-thread-instrumentation=ON
+
 binlog-direct-non-transactional-updates
 
 default-storage-engine=myisam

mysql-test/include/filter_file.inc

@@ -0,0 +1,145 @@
+# ==== Purpose ====
+#
+# Read the contents of a file, filter it through a perl script, and
+# write it back.
+#
+# This is useful in conjunction with include/write_result_to_file.inc
+# and cat_file or include/read_file_to_var.inc.  See
+# e.g. include/show_events.inc for an example.
+#
+# ==== Usage ====
+#
+# --let $input_file= <FILE_NAME>
+# [--let $output_file= <FILE_NAME>]
+# --let $script= <PERL_SCRIPT>
+# [--let $select_columns= <LIST OF NUMBERS>]
+# [--let $pre_script= <PERL_SCRIPT>]
+# [--let $rpl_debug= 1]
+# --source include/filter_file.inc
+#
+# Parameters:
+#
+#   $input_file
+#     File to read from.
+#
+#   $output_file
+#     File to write to. If omitted, writes to $input_file.
+#
+#   $script
+#     This script will be executed once for each line in $input_file.
+#
+#     When the script starts, the perl variable $_ will be set to the
+#     current row (including the terminating newline).  The script can
+#     modify $_ in any way it likes, and the result will be appended
+#     to $output_file.  It is even possible to remove a row by setting
+#     $_ to '', or to generate extra rows by appending "\n" to $_.
+#
+#     Since mysqltest is incapable of properly escaping dollar
+#     characters, you have to replace any '$' in your script by
+#     'DOLLAR' (otherwise mysqltest would try to interpolate parts of
+#     your script).  filter_file.inc will replace 'DOLLAR' by '$'
+#     before evaluating your script.
+#
+#   $select_columns
+#     For convenience, if you set this to a space-separated list of
+#     numbers, it will print only the numbered columns, in the given
+#     order.
+#
+#   $pre_script
+#     This script will be evaluated before starting to iterate over
+#     the lines of $input_file.  It can be useful if you need some
+#     sort of initialization; for example, you can define a subroutine
+#     here and call it from $script.
+#
+#   $rpl_debug
+#     If set, verbose debug info is printed.
+
+--let $include_filename= filter_file.inc
+--source include/begin_include_file.inc
+
+if ($rpl_debug)
+{
+  --echo pre_script='$pre_script'
+  --echo script='$script'
+  --echo select_columns='$select_columns'
+  --echo input_file='$input_file' output_file='$output_file'
+}
+
+--let _FF_PRE_SCRIPT= $pre_script
+--let _FF_SCRIPT= $script
+--let _FF_INPUT_FILE= $input_file
+--let _FF_OUTPUT_FILE= $output_file
+--let _FF_SELECT_COLUMNS= $select_columns
+--let _FF_DEBUG= $rpl_debug
+if (!$output_file)
+{
+  --let _FF_OUTPUT_FILE= $input_file
+}
+perl;
+  my $pre_script = $ENV{'_FF_PRE_SCRIPT'};
+  $pre_script =~ s/DOLLAR/\$/g;
+  my $script = $ENV{'_FF_SCRIPT'};
+  $script =~ s/DOLLAR/\$/g;
+  my $input_file = $ENV{'_FF_INPUT_FILE'};
+  my $output_file = $ENV{'_FF_OUTPUT_FILE'};
+  my $select_columns = $ENV{'_FF_SELECT_COLUMNS'};
+  my $debug = $ENV{'_FF_DEBUG'};
+  if ($select_columns)
+  {
+    chomp($select_columns);
+    $select_columns =~ s/[, ]+/,/g;
+    $script = '
+    chomp;
+    my @cols = split(/\t/, $_);
+    $_ = join("\t", map { $cols[$_ - 1] } ('.$select_columns.'))."\n";
+    ' . $script;
+  }
+  unless ($keep_quotes)
+  {
+    $pre_script = 'my %unquote = ("n"=>"\n","t"=>"\t","\\\\"=>"\\\\");' . $pre_script;
+    $script .= 's{\\\\(.)}{$unquote{$1}}ge;';
+  }
+  if ($debug)
+  {
+    $script = 'print "BEFORE:\'$_\'";' . $script . 'print "AFTER:\'$_\'";'
+  }
+  # Generate a script (perl is faster if we avoid many calls to eval).
+  my $full_script =
+'
+  open FILE, "< $input_file" or die "Error opening $input_file: $!";
+  my $filtered_contents = "";
+  my %column_names = ();
+  '.$pre_script.';
+  while (<FILE>)
+  {
+    chomp;
+    s/\r//g;
+    if (!%column_names)
+    {
+      my $n = 1;
+      %column_names = map { $_ => $n++ } split(/\t/, $_);
+    }
+    else
+    {
+      ' . $script . '
+    }
+    $filtered_contents .= $_."\n";
+  }
+  close FILE or die "Error closing $input_file: $!";
+  open FILE, "> $output_file" or die "Error opening $output_file: $!";
+  binmode FILE;
+  print FILE $filtered_contents or die "Error writing filtered contents to $output_file: $!";
+  close FILE or die "Error closing $output_file: $!";
+  return 0;
+';
+  if ($debug)
+  {
+    print STDOUT "full_script=<<END_OF_SCRIPT\n${full_script}END_OF_SCRIPT\n"
+  }
+  my $eval_ret = eval($full_script);
+  defined($eval_ret) or die "Parse error or 'die' invoked when evaluating perl script '$full_script': $@";
+  $eval_ret == 0 or die "Non-zero exit value $eval_ret from script '$script'";
+EOF
+
+--let $include_filename= filter_file.inc
+--source include/end_include_file.inc

mysql-test/include/have_innodb.combinations

@@ -16,3 +16,4 @@ innodb-trx
 innodb
 innodb-cmpmem
 innodb-trx
+innodb-metrics

mysql-test/include/show_binlog_events.inc

@@ -1,21 +1,43 @@
-##############################################################################
+# ==== Purpose ====
-# Show binary log events 
 #
-# Useage: 
+# Execute SHOW BINLOG EVENTS and mask non-deterministic output.
-# let $binlog_file= master-bin.000002; 
-# let $binlog_start= 240; 
-# let $binlog_limit= 1, 3; 
-# source include/show_binlog_events.inc;
 #
-# It shows the first binary log file if $binlog_file is not given. 
+# ==== Usage ====
 #
-# It shows events from the end position of the description event if
+# [--let $binlog_file= [<FILENAME> | LAST]]
-# $binlog_start is not given.
+# [--let $binlog_start= <POSITION> ]
+# [--let $binlog_limit= 1, 3 ]
+# [--let $keep_gtid_events= 1]
+# --source include/show_binlog_events.inc
 #
-# It shows all of the events if $binlog_limit is not given. 
+# Parameters:
-# $binlog_format has the same semantic with 'LIMIT' option.
 #
-##############################################################################
+#   $binlog_file
+#     Filename for the 'IN' clause of SHOW BINLOG EVENTS. If none
+#     given, no argument is given to SHOW BINLOG EVENTS, meaning that
+#     it uses the first binlog. If you set this to "LAST", it prints
+#     the last binlog (according to SHOW MASTER STATUS).
+#
+#   $binlog_start
+#     Position for the 'FROM' clause of SHOW BINLOG EVENTS. If none
+#     given, starts right after the Format_description_log_event.
+#
+#   $binlog_limit
+#     Limit for the 'LIMIT' clause of SHOW BINLOG EVENTS, i.e.:
+#       $binlog_limit= 3    -- print three events
+#       $binlog_limit= 4, 3 -- skip four events, print the three next events
+#
+#   $keep_gtid_events
+#     By default, Gtid_log_event and Previous_gtid_log_event are
+#     filtered out, so that the output is independent of whether GTIDs
+#     are enabled or not.  If this flag is set, events are kept but
+#     the actual GTID values are masked out.
+
+--let $include_filename= show_binlog_events.inc
+--source include/begin_include_file.inc
 
 --let $is_relay_log= 0
 --source include/show_events.inc
+
+--let $include_filename= show_binlog_events.inc
+--source include/end_include_file.inc

mysql-test/include/show_events.inc

@@ -1,7 +1,14 @@
-##############################################################################
+# ==== Purpose ====
-# It's an auxiliary file used to show binary log events or relay log events.
+#
-# It is only called by show_binlog_events.inc and show_relaylog_events.inc.
+# Auxiliary file used in include/show_binlog_events.inc and
-##############################################################################
+# include/show_relaylog_events.inc.
+#
+# ==== Usage ====
+#
+# See include/show_binlog_events.inc
+
+--let $include_filename= show_events.inc
+--source include/begin_include_file.inc
 
 if (!$binlog_start)
 {
@@ -12,27 +19,83 @@ if (!$binlog_start)
   --let $binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
 }
 
---let $_statement=show binlog events
+--let $_se_old_statement= $statement
+
+--let $statement=show BINLOG events
 if ($is_relay_log)
 {
-  --let $_statement=show relaylog events
+  --let $statement=show relaylog events
 }
 
 if ($binlog_file)
 {
-  --let $_statement= $_statement in '$binlog_file'
+  --let $_binlog_file= $binlog_file
-}
+  if ($binlog_file == 'LAST')
-
---let $_statement= $_statement from $binlog_start
-
-# Cannot use if($binlog_limit) since the variable may begin with a 0
-
-if (`SELECT '$binlog_limit' <> ''`)
   {
-  --let $_statement= $_statement limit $binlog_limit
+    if ($is_relay_log)
+    {
+      --let $_binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
+    }
+    if (!$is_relay_log)
+    {
+      --let $_binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+    }
+  }
+  --let $statement= $statement in '$_binlog_file'
 }
 
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
+--let $statement= $statement from $binlog_start
---replace_column 2 # 4 # 5 #
+
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/
+if ($binlog_limit != '')
---eval $_statement
+{
+  --let $statement= $statement limit $binlog_limit
+}
+
+# Execute the statement and write to $output_file
+--let $output_file= GENERATE
+--source include/write_result_to_file.inc
+
+# Filter the file through the following script.
+--delimiter ||
+let $script=
+  # todo: use select_columns instead (requires updating all result files)
+  s{([^\t]*\t)[^\t]*(\t[^\t]*\t)[^\t]*\t[^\t]*(\t[^\t]*)}{DOLLAR1#DOLLAR2#\t#DOLLAR3};
+  s{/\* xid=.* \*/}{/\* XID \*/};
+  s{table_id: [0-9]+}{table_id: #};
+  s{file_id=[0-9]+}{file_id=#};
+  s{block_len=[0-9]+}{block_len=#};
+  s{Server ver:.*DOLLAR}{SERVER_VERSION, BINLOG_VERSION};
+  s{SQL_LOAD-[a-z,0-9,-]*.[a-z]*}{SQL_LOAD-<SERVER UUID>-<MASTER server-id>-<file-id>.<extension>};
+  s{rand_seed1=[0-9]*,rand_seed2=[0-9]*}{rand_seed1=<seed 1>,rand_seed2=<seed 2>};
+  s{((?:master|slave|slave-relay)-bin\.[0-9]{6};pos=)[0-9]+DOLLAR}{DOLLAR1POS};
+  s{DOLLARmysqltest_vardir}{MYSQLTEST_VARDIR}g;
+||
+--let $pre_script= my DOLLARmysqltest_vardir = DOLLARENV{'MYSQLTEST_VARDIR'};
+if (!$keep_gtid_events)
+{
+  --let $script= $script DOLLAR_ = '' if (m{\t(?:Gtid|Previous_gtids)\t});
+}
+if ($keep_gtid_events)
+{
+  let $pre_script= $pre_script
+    my DOLLARuuid_regex = '[0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}';
+    my DOLLARuuid_sidno_regex = DOLLARuuid_regex.'(?::[0-9]+(?:-[0-9]+)?)+';
+  ||
+  --let $script= $script s{DOLLARuuid_sidno_regex(?:,DOLLARuuid_sidno_regex)*}{Gtid_set};
+}
+--delimiter ;
+
+#--let $select_columns= 1 3 6
+--let $input_file= $output_file
+--source include/filter_file.inc
+
+# Write to result file
+--cat_file $output_file
+
+# Remove the file
+--remove_file $output_file
+
+--let $statement= $_se_old_statement
+
+--let $include_filename= show_events.inc
+--source include/end_include_file.inc

mysql-test/include/write_result_to_file.inc

@@ -0,0 +1,77 @@
+# ==== Purpose ====
+#
+# Execute a statement and write the result to a file.  This is useful
+# if the output needs more advanced parsing than can be done by
+# mysqltest commands.
+#
+# ==== Usage ====
+#
+# --let $statement= <STATEMENT>
+# --let $output_file= {<FILE>|GENERATE}
+# [--let $server_number= <NUMBER>]
+# [--let $dont_print_statement= 1]
+# --source include/write_result_to_file.inc
+#
+# Parameters:
+#   $statement
+#     The statement to execute.
+#
+#   $server_number
+#     1 for the master, 2 for the slave, 3 for next server, etc.
+#     If omitted, uses current connection.
+#
+#   $output_file
+#     Name of file to write. If omitted, generates a new filename and
+#     stores the name both in the mysqltest variable $output_file and
+#     in the environment variable $OUTPUT_FILE.
+#
+#   $dont_print_statement
+#     By default, the statement is echoed to the result log.  If the
+#     statement contains non-deterministic output, set this variable
+#     to suppress it.
+
+--let _WRTF_SERVER_NUMBER= $server_number
+if (!$server_number)
+{
+  --let _WRTF_SERVER_NUMBER= `SELECT 1 + @@PORT - $MASTER_MYPORT`
+}
+
+--let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER]
+if (!$dont_print_statement)
+{
+  --let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER statement=$statement]
+}
+
+--let $include_filename= write_result_to_file.inc $_write_result_msg
+--source include/begin_include_file.inc
+
+if ($statement == '')
+{
+  --die !!!ERROR IN TEST: mysqltest variable 'statement' not set in write_result_to_file.inc
+}
+--let _WRTF_STATEMENT= $statement
+
+if (!$output_file)
+{
+  --die !!!ERROR IN TEST: mysqltest variable 'output_file' not set in write_result_to_file.inc
+}
+if ($output_file == GENERATE)
+{
+  --let $output_file= `SELECT UUID()`
+  --let $output_file= $MYSQLTEST_VARDIR/tmp/_stmt_file_$output_file
+}
+--let _WRTF_OUTPUT_FILE= $output_file
+
+perl;
+  my $stmt= $ENV{'_WRTF_STATEMENT'};
+  my $server_number= $ENV{'_WRTF_SERVER_NUMBER'};
+  my $mysql = $ENV{'MYSQL'};
+  $mysql =~ s/( --|$)/ --defaults-group-suffix=.$server_number$1/;
+  my $outfile = $ENV{'_WRTF_OUTPUT_FILE'};
+  open MYSQL, "| $mysql > $outfile" or die "Failed to open pipe to client on server '$server_number': $!";
+  print MYSQL $stmt, ';' or die "Error printing statement to MYSQL pipe: $!";
+  close MYSQL or die "Error closing MYSQL pipe: $!";
+EOF
+
+--let $include_filename= write_result_to_file.inc [$write_result_msg]
+--source include/end_include_file.inc

mysql-test/lib/My/Test.pm

@@ -100,7 +100,7 @@ sub write_test {
 
   my $serialized= Storable::freeze($test);
   $serialized =~ s/([\x0d\x0a\\])/sprintf("\\%02x", ord($1))/eg;
-  print $sock $header, "\n", $serialized, "\n";
+  send $sock,$header. "\n". $serialized. "\n", 0;
 }
 
 
@@ -111,8 +111,7 @@ sub read_test {
   $serialized =~ s/\\([0-9a-fA-F]{2})/chr(hex($1))/eg;
   my $test= Storable::thaw($serialized);
   use Data::Dumper;
-  # We get a stack trace here when 
+  die "wrong class (hack attempt?): ".ref($test)."\n".Dumper(\$test, $serialized)
-  die "wrong class (hack attempt?): ".ref($test)."\n".Dumper(\$test, $serialized) . " Stack trace: "
     unless ref($test) eq 'My::Test';
   resfile_from_test($test) if $::opt_resfile;
   return $test;

mysql-test/r/ctype_cp932_binlog_row.result

@@ -6,7 +6,7 @@ CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
 EXECUTE stmt1 USING @var1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(f1 blob)
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/r/ctype_cp932_binlog_stm.result

@@ -6,7 +6,7 @@ CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
 EXECUTE stmt1 USING @var1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(f1 blob)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -32,7 +32,7 @@ HEX(s1)	HEX(s2)	d
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-show binlog events from <binlog_start>|
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,

mysql-test/r/events_2.result

@@ -378,7 +378,7 @@ do
 select 1;
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 drop event event_35981;
 create event event_35981 on schedule every 1 hour starts current_timestamp
 on completion not preserve
@@ -399,7 +399,7 @@ Warnings:
 Note	1544	Event execution time is in the past. Event has been disabled
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion not preserve;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion preserve;
 Warnings:

mysql-test/r/events_bugs.result

@@ -454,10 +454,10 @@ e3		+00:00	CREATE DEFINER=`root`@`localhost` EVENT `e3` ON SCHEDULE EVERY 1 DAY
 The following should fail, and nothing should be altered.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' DISABLE;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 The following should give warnings, and nothing should be created.
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00'

mysql-test/r/flush_block_commit_notembedded.result

@@ -10,13 +10,11 @@ SELECT 1;
 1
 # Switch to connection con2
 FLUSH TABLES WITH READ LOCK;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 # Switch to connection con1
 INSERT INTO t1 VALUES (1);
 # Switch to connection con2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 UNLOCK TABLES;
 # Switch to connection con1
 DROP TABLE t1;

mysql-test/r/group_by.result

@@ -359,7 +359,7 @@ A	4
 B	4
 a	1
 b	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 SELECT a FROM t1 GROUP BY a;
 a
 NULL
@@ -398,7 +398,7 @@ A	4
 B	4
 a	1
 b	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 drop table t1;
 CREATE TABLE t1 (
 `a` char(193) default NULL,
@@ -515,7 +515,7 @@ a	count(*)
 NULL	9
 	3
 b	1
-set option sql_big_tables=1;
+set big_tables=1;
 select a,count(*) from t1 group by a;
 a	count(*)
 NULL	9
@@ -1918,7 +1918,7 @@ DROP TABLE t1;
 # Bug#11765254 (58200): Assertion failed: param.sort_length when grouping
 # by functions
 #
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES (0),(0);
 SELECT 1 FROM t1 GROUP BY IF(`a`,'','');
@@ -1945,7 +1945,7 @@ Warning	1292	Truncated incorrect INTEGER value: 'jxW<'
 Warning	1292	Truncated incorrect INTEGER value: 'K'
 Warning	1292	Truncated incorrect INTEGER value: 'jxW<'
 DROP TABLE t1;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 # End of 5.1 tests
 #
 # LP bug#694450 Wrong result with non-standard GROUP BY + ORDER BY

mysql-test/r/multi_update.result

@@ -603,7 +603,7 @@ select * from t2 /* must be (3,1), (4,4) */;
 a	b
 3	1
 4	4
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -616,7 +616,7 @@ insert into t2 values (1,2),(3,4),(4,4);
 reset master;
 UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)

mysql-test/r/mysqlbinlog.result

@@ -890,7 +890,7 @@ CREATE TABLE t1(id int);
 DROP TABLE t1;
 DROP DATABASE test1;
 FLUSH LOGS;
-show binlog events in 'master-bin.000002' from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	#	#	CREATE DATABASE test1
 master-bin.000002	#	Query	#	#	use `test1`; CREATE TABLE t1(id int)

mysql-test/r/old-mode.result

@@ -18,4 +18,4 @@ test.t2	2948697075
 drop table t1,t2;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	init	SHOW PROCESSLIST

mysql-test/r/partition_binlog.result

@@ -39,7 +39,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 ALTER TABLE t1 TRUNCATE PARTITION p0;
 ALTER TABLE t1 DROP PARTITION p0;
-show binlog events in 'master-bin.000001' from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 ANALYZE PARTITION p0
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0

mysql-test/r/query_cache.result

@@ -652,14 +652,14 @@ select * from t1;
 a
 1
 2
-SET OPTION SQL_SELECT_LIMIT=1;
+SET SQL_SELECT_LIMIT=1;
 select * from t1;
 a
 1
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	2
-SET OPTION SQL_SELECT_LIMIT=DEFAULT;
+SET SQL_SELECT_LIMIT=DEFAULT;
 drop table t1;
 flush query cache;
 reset query cache;
@@ -1932,6 +1932,18 @@ set local query_cache_type= on;
 select @@query_cache_size, @@global.query_cache_type, @@local.query_cache_type;
 @@query_cache_size	@@global.query_cache_type	@@local.query_cache_type
 20971520	ON	ON
+#
+# Bug#12977203: SERVER CRASH ON A DERIVED TABLE WITH QUERY CACHE ENABLED
+#
+SET @qc= @@query_cache_size;
+SET GLOBAL query_cache_size=1355776;
+CREATE TABLE t1 (f1 blob);
+SELECT COUNT(*) FROM (SELECT * FROM t1 ) tt;
+COUNT(*)
+0
+DROP TABLE t1;
+SET GLOBAL query_cache_size= @qc;
+#
 restore defaults
 SET GLOBAL query_cache_type= default;
 SET GLOBAL query_cache_size= default;

mysql-test/r/sp-destruct.result

@@ -149,7 +149,7 @@ alter table mysql.proc drop column type;
 # The below statement should not cause assertion failure.
 drop database mysqltest;
 Warnings:
-Error	1547	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
+Error	1728	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
 # Restore mysql.proc.
 drop table mysql.proc;
 #
@@ -166,7 +166,7 @@ CREATE PROCEDURE db1.p1() SET @foo = 10;
 ALTER TABLE mysql.proc MODIFY comment CHAR (32);
 DROP DATABASE db1;
 Warnings:
-Error	1548	Cannot load from mysql.proc. The table is probably corrupted
+Error	1729	Cannot load from mysql.proc. The table is probably corrupted
 # Restore mysql.proc
 DROP TABLE mysql.proc;
 RENAME TABLE proc_backup TO mysql.proc;

mysql-test/r/sp-threads.result

@@ -36,7 +36,7 @@ show processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 #	root	localhost	test	Sleep	#		NULL	0.000
 #	root	localhost	test	Query	#	Waiting for table metadata lock	update t1, t2 set val= 1 where id1=id2	0.000
-#	root	localhost	test	Query	#	NULL	show processlist	0.000
+#	root	localhost	test	Query	#	init	show processlist	0.000
 #	root	localhost	test	Sleep	#		NULL	0.000
 unlock tables;
 drop procedure bug9486;

mysql-test/r/sp_trans_log.result

@@ -11,16 +11,16 @@ insert into t1 values (null);
 select count(*) from t1 into @a;
 return @a;
 end|
-reset master|
+reset master;
-insert into t2 values (bug23333(),1)|
+insert into t2 values (bug23333(),1);
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start> limit 0, 4|
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
-select count(*),@a from t1 /* must be 1,1 */|
+select count(*),@a from t1 /* must be 1,1 */;
 count(*)	@a
 1	1
 drop table t1,t2;

mysql-test/r/subselect_cache.result

@@ -1612,7 +1612,7 @@ Subquery_cache_hit	0
 Subquery_cache_miss	4
 drop table t1;
 #test of sql_big_tables switch and outer table reference in subquery with grouping
-set option sql_big_tables=1;
+set big_tables=1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT);
 INSERT INTO t1 VALUES (1,1),(2,1),(3,2),(4,2),(5,3),(6,3);
 SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) FROM t1 AS t1_outer;
@@ -1624,7 +1624,7 @@ SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) FROM t1 AS t1_
 5
 6
 drop table t1;
-set option sql_big_tables=0;
+set big_tables=0;
 #test of function reference to outer query
 set local group_concat_max_len=400;
 create table t2 (a int, b int);

mysql-test/r/type_blob.result

@@ -232,7 +232,7 @@ HELLO
 HELLO MY
 a
 hello
-set option sql_big_tables=1;
+set big_tables=1;
 select distinct t from t1;
 t
 NULL
@@ -313,7 +313,7 @@ HELLO
 HELLO MY
 a
 hello
-set option sql_big_tables=0;
+set big_tables=0;
 select distinct * from t1;
 t	c	b	d
 NULL	NULL	NULL	NULL

mysql-test/r/user_var-binlog.result

@@ -6,7 +6,7 @@ INSERT INTO t1 VALUES(@`a b`);
 set @var1= "';aaa";
 SET @var2=char(ascii('a'));
 insert into t1 values (@var1),(@var2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	User var	#	#	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci

mysql-test/suite.pm

@@ -24,6 +24,10 @@ sub skip_combinations {
   $skip{'include/have_debug.inc'} = 'Requires debug build'
              unless defined $::mysqld_variables{'debug-dbug'};
 
+  $skip{'include/have_ssl_communication.inc'} =
+  $skip{'include/have_ssl.inc'} = 'Requires SSL'
+             unless defined $::mysqld_variables{'ssl-ca'};
+
   $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
 
   $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb'

mysql-test/suite/binlog/r/binlog_checksum.result

@@ -10,10 +10,10 @@ master-bin.000001	#
 create table t1 (a int);
 flush logs;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 show tables;
 Tables_in_test
 t1

mysql-test/suite/binlog/r/binlog_database.result

@@ -7,7 +7,7 @@ create function sf1 (a int) returns int return a+1;
 create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a);
 create procedure sp1 (a int) insert into t1 values(a);
 drop database testing_1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
@@ -25,7 +25,7 @@ insert into t1 values (1);
 drop database if exists mysqltest1;
 insert into t1 values (1);
 drop table tt1, t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create temporary table tt1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
@@ -56,7 +56,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 SHOW TABLES FROM db1;
 Tables_in_db1
 t2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `db1`; drop table `t1`
 DROP TABLE t3;
@@ -70,7 +70,7 @@ create function sf1 (a int) returns int return a+1;
 create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a);
 create procedure sp1 (a int) insert into t1 values(a);
 drop database testing_1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
@@ -88,7 +88,7 @@ insert into t1 values (1);
 drop database if exists mysqltest1;
 insert into t1 values (1);
 drop table tt1, t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create temporary table tt1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
@@ -119,7 +119,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 SHOW TABLES FROM db1;
 Tables_in_db1
 t2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `db1`; drop table `t1`
 DROP TABLE t3;
@@ -133,7 +133,7 @@ create function sf1 (a int) returns int return a+1;
 create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a);
 create procedure sp1 (a int) insert into t1 values(a);
 drop database testing_1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
@@ -151,7 +151,7 @@ insert into t1 values (1);
 drop database if exists mysqltest1;
 insert into t1 values (1);
 drop table tt1, t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -183,7 +183,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 SHOW TABLES FROM db1;
 Tables_in_db1
 t2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `db1`; drop table `t1`
 DROP TABLE t3;

mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result

@@ -11,7 +11,7 @@ show binary logs;
 Log_name	File_size
 master-bin.000001	#
 ### assertion: binlog contents from regular entries
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 FLUSH LOGS;
@@ -24,7 +24,7 @@ master-bin.000002
 
 ### assertion: original binlog content still exists, despite we
 ###            renamed and changed the index file 
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin-b34582.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 ### assertion: user changed binlog index shows correct entries

mysql-test/suite/binlog/r/binlog_drop_if_exists.result

@@ -6,7 +6,7 @@ DROP VIEW IF EXISTS db_bug_13684.v;
 DROP EVENT IF EXISTS db_bug_13684.e;
 DROP TABLE IF EXISTS db_bug_13684.t;
 DROP DATABASE IF EXISTS db_bug_13684;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
 master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
@@ -32,7 +32,7 @@ END;
 CREATE FUNCTION db_bug_13684.f (s CHAR(20))
 RETURNS CHAR(50) DETERMINISTIC
 RETURN s;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
 master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
@@ -64,7 +64,7 @@ DROP VIEW IF EXISTS db_bug_13684.v;
 DROP EVENT IF EXISTS db_bug_13684.e;
 DROP TABLE IF EXISTS db_bug_13684.t;
 DROP DATABASE IF EXISTS db_bug_13684;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
 master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f

mysql-test/suite/binlog/r/binlog_implicit_commit.result

@@ -3,10 +3,9 @@ SET BINLOG_FORMAT = STATEMENT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
@@ -16,16 +15,15 @@ RESET MASTER;
 SET AUTOCOMMIT = 0;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
@@ -34,7 +32,7 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
@@ -46,13 +44,13 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 1;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
@@ -62,16 +60,13 @@ RESET MASTER;
 SET AUTOCOMMIT = 1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
@@ -81,26 +76,21 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
@@ -110,13 +100,13 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 1;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
@@ -126,16 +116,13 @@ RESET MASTER;
 SET AUTOCOMMIT = 1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
@@ -146,10 +133,9 @@ SET BINLOG_FORMAT = ROW;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -160,17 +146,16 @@ RESET MASTER;
 SET AUTOCOMMIT = 0;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -181,7 +166,7 @@ master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -195,14 +180,14 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 1;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -213,16 +198,13 @@ RESET MASTER;
 SET AUTOCOMMIT = 1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -234,26 +216,21 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -265,14 +242,14 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 1;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -283,16 +260,13 @@ RESET MASTER;
 SET AUTOCOMMIT = 1;
 BEGIN;
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 SET AUTOCOMMIT = 0;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 INSERT INTO t1 VALUES (3);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -304,24 +278,23 @@ COMMIT;
 RESET MASTER;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 LOCK TABLES t1 WRITE;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 INSERT INTO t1 VALUES (2);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 UNLOCK TABLES;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -332,7 +305,7 @@ master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

mysql-test/suite/binlog/r/binlog_innodb.result

@@ -63,7 +63,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 BEGIN;
 UPDATE t1 SET b = 4*a WHERE a > 4;
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB
 master-bin.000001	#	Query	#	#	BEGIN
@@ -157,8 +157,7 @@ a	b
 1	1
 4	4
 # There must no UPDATE in binlog;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -167,7 +166,6 @@ reset master;
 UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 # There must be no UPDATE query event;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 drop table t1, t2;
 End of tests

mysql-test/suite/binlog/r/binlog_innodb_row.result

@@ -7,7 +7,7 @@ update t1 set i = 3 where i < 3;
 ERROR 23000: Duplicate entry '3' for key 'i'
 commit;
 *** Results of the test: the binlog must have only Write_rows events not any Update_rows ***
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -22,7 +22,7 @@ insert into t1 values (3),(4),(1),(2);
 ERROR 23000: Duplicate entry '1' for key 'i'
 commit;
 *** Results of the test: the binlog must have only one Write_rows event not two ***
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -38,7 +38,7 @@ DROP TABLE t1;
 ###############################################
 ### assertion: No event for 'TRUNCATE TABLE t2'
 ###############################################
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( c1 int , primary key (c1)) ENGINE=InnoDB
 master-bin.000001	#	Query	#	#	BEGIN
@@ -55,7 +55,7 @@ DROP TEMPORARY TABLE t1;
 ###############################################
 ### assertion: No event for 'TRUNCATE TABLE t1'
 ###############################################
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `t1` /* generated by server */
 ###############################################

mysql-test/suite/binlog/r/binlog_killed.result

@@ -91,7 +91,7 @@ select @b  /* must be 1 at the end of a stmt calling bug27563() */;
 @b
 1
 must have the update query event on the 4th line
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	User var	#	#	@`b`=0
@@ -130,7 +130,7 @@ select @b  /* must be 1 at the end of a stmt calling bug27563() */;
 @b
 1
 must have the delete query event on the 4th line
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	User var	#	#	@`b`=0

mysql-test/suite/binlog/r/binlog_killed_simulate.result

@@ -16,7 +16,7 @@ create table t2 (a int, b int) ENGINE=MyISAM;
 reset master;
 load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
 ERROR 70100: Query execution was interrupted
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#

mysql-test/suite/binlog/r/binlog_mdev342.result

@@ -18,7 +18,7 @@ show binary logs;
 Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
-show binlog events in 'master-bin.000001' from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb
@@ -26,5 +26,5 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=<binlog_start>
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 DROP TABLE t1;

mysql-test/suite/binlog/r/binlog_mixed_load_data.result

@@ -1,7 +1,7 @@
 RESET MASTER;
 CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM;
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

mysql-test/suite/binlog/r/binlog_row_binlog.result

@@ -8,7 +8,7 @@ commit;
 begin;
 insert t2 values (5);
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=innodb
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (a int) engine=innodb
@@ -26,7 +26,7 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
@@ -231,8 +231,8 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
-show binlog events in 'master-bin.000002' from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 set @ac = @@autocommit;
@@ -245,7 +245,7 @@ insert into t1 values (2);
 insert into t1 values (3);
 commit;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
@@ -268,7 +268,7 @@ Binlog_cache_use	0
 *** the following must show the counter value = 1 ***
 Variable_name	Value
 Binlog_cache_use	1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b char(255)) engine=innodb
 master-bin.000001	#	Query	#	#	use `test`; flush status
@@ -474,7 +474,7 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -487,7 +487,7 @@ set @b= 14632475938453979136;
 execute stmt using @a, @b;
 deallocate prepare stmt;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -518,7 +518,7 @@ END//
 CALL p1();
 c1	c2	c3	d1	d2	d3
 utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	2	2	2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
 master-bin.000001	#	Query	#	#	use `bug39182`; CREATE TABLE t1 (a VARCHAR(255) COLLATE utf8_unicode_ci)
@@ -595,7 +595,7 @@ INSERT INTO user SET host='localhost', user='@#@', password=password('Just a tes
 UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@';
 DELETE FROM user WHERE host='localhost' AND user='@#@';
 use test;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -630,7 +630,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207);
 insert /*! delayed */ into t1 values (null);
 insert delayed into t1 values (300);
 FLUSH TABLES;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result

@@ -3,7 +3,7 @@ create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)

mysql-test/suite/binlog/r/binlog_row_drop_tbl.result

@@ -6,7 +6,7 @@ BEGIN;
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;;
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result

@@ -23,7 +23,7 @@ USE test;
 SELECT GET_LOCK("a",10);
 GET_LOCK("a",10)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE `drop-temp+table-test`
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; CREATE TABLE t(c1 int)
@@ -45,7 +45,7 @@ INSERT INTO t1 VALUES ('1');
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i text )
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_row_insert_select.result

@@ -6,7 +6,7 @@ insert into t2 values(1),(2);
 reset master;
 insert into t1 select * from t2;
 ERROR 23000: Duplicate entry '2' for key 'a'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -22,6 +22,5 @@ insert into t1 values(1),(1);
 reset master;
 create table t2(unique(a)) select a from t1;
 ERROR 23000: Duplicate entry '1' for key 'a'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 drop table t1;

mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

@@ -7,7 +7,7 @@ begin;
 insert into t1 values(1);
 insert into t2 select * from t1;
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -26,7 +26,7 @@ insert into t2 select * from t1;
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -44,7 +44,7 @@ rollback to savepoint my_savepoint;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -75,7 +75,7 @@ select a from t1 order by a;
 a
 5
 7
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -103,7 +103,7 @@ insert into t2 select * from t1;
 select get_lock("a",10);
 get_lock("a",10)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -114,7 +114,7 @@ delete from t2;
 reset master;
 insert into t1 values(9);
 insert into t2 select * from t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -130,7 +130,7 @@ reset master;
 insert into t1 values(10);
 begin;
 insert into t2 select * from t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -142,7 +142,7 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 insert into t1 values(11);
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -164,7 +164,7 @@ begin;
 insert into t1 values(12);
 insert into t2 select * from t1;
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -179,8 +179,7 @@ begin;
 insert into t1 values(13);
 insert into t2 select * from t1;
 rollback;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 delete from t1;
 delete from t2;
 reset master;
@@ -191,11 +190,12 @@ insert into t1 values(15);
 insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 delete from t1;
 delete from t2;
@@ -212,11 +212,12 @@ select a from t1 order by a;
 a
 16
 18
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -265,11 +266,12 @@ insert into t2 values (3);
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -382,7 +384,7 @@ SELECT * from t2;
 a	b
 100	100
 DROP TABLE t1,t2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -455,8 +457,7 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select count(*) from tt /* 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 select count(*) from ti /* zero */;
 count(*)
 0
@@ -476,8 +477,7 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 select count(*) from ti /* zero */;
 count(*)
 0
@@ -503,7 +503,7 @@ insert into t2 select bug27417(2);
 reset master;
 insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -522,7 +522,7 @@ delete from t2 where a=bug27417(3);
 select count(*) from t2 /* nothing got deleted */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -548,7 +548,7 @@ insert into t2 values (1);
 reset master;
 insert into t2 values (bug27417(1));
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -564,7 +564,7 @@ insert into t2 values (2);
 reset master;
 insert into t2 select bug27417(1) union select bug27417(2);
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -579,7 +579,7 @@ insert into t3 values (1,1),(2,3),(3,4);
 reset master;
 update t3 set b=b+bug27417(1);
 ERROR 23000: Duplicate entry '4' for key 'b'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
@@ -599,7 +599,7 @@ insert into t4 values (1,1),(2,2);
 reset master;
 UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -631,7 +631,7 @@ insert into t3 values (bug27417(1), 2);
 reset master;
 delete from t2;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
@@ -653,7 +653,7 @@ insert into t5 values (1),(2);
 reset master;
 delete t2.* from t2,t5 where t2.a=t5.a + 1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -675,7 +675,7 @@ a	b
 select count(*) from t1 /* must be 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -699,8 +699,7 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select count(*) from tt /* 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 select count(*) from ti /* zero */;
 count(*)
 0
@@ -720,8 +719,7 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 select count(*) from ti /* zero */;
 count(*)
 0
@@ -747,7 +745,7 @@ insert into t2 select bug27417(2);
 reset master;
 insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -765,7 +763,7 @@ delete from t2 where a=bug27417(3);
 select count(*) from t2 /* nothing got deleted */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -790,7 +788,7 @@ insert into t2 values (1);
 reset master;
 insert into t2 values (bug27417(1));
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -805,7 +803,7 @@ insert into t2 values (2);
 reset master;
 insert into t2 select bug27417(1) union select bug27417(2);
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -819,7 +817,7 @@ insert into t3 values (1,1),(2,3),(3,4);
 reset master;
 update t3 set b=b+bug27417(1);
 ERROR 23000: Duplicate entry '4' for key 'b'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
@@ -838,7 +836,7 @@ insert into t4 values (1,1),(2,2);
 reset master;
 UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -869,7 +867,7 @@ insert into t3 values (bug27417(1), 2);
 reset master;
 delete from t2;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
@@ -890,7 +888,7 @@ insert into t5 values (1),(2);
 reset master;
 delete t2.* from t2,t5 where t2.a=t5.a + 1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -911,7 +909,7 @@ a	b
 select count(*) from t1 /* must be 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result

@@ -3,7 +3,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207);
 insert /*! delayed */ into t1 values (null);
 insert delayed into t1 values (300);
 FLUSH TABLES;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'latin1_swedish_ci'))
@@ -24,7 +24,7 @@ RESET MASTER;
 insert /* before delayed */ delayed /* after delayed */ into t1 values (null),(null),(null),(null);
 insert  /*! delayed */ into t1 values (null),(null),(400),(null);
 FLUSH TABLES;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=301

mysql-test/suite/binlog/r/binlog_stm_binlog.result

@@ -3,7 +3,7 @@ create table t1 (a int, b int) engine=innodb;
 begin;
 insert into t1 values (1,2);
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b int) engine=innodb
@@ -21,7 +21,7 @@ commit;
 begin;
 insert t2 values (5);
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=innodb
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (a int) engine=innodb
@@ -37,7 +37,7 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
@@ -142,8 +142,8 @@ master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(3 + 4)
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(2 + 4)
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(1 + 4)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
-show binlog events in 'master-bin.000002' from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 set @ac = @@autocommit;
@@ -156,7 +156,7 @@ insert into t1 values (2);
 insert into t1 values (3);
 commit;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
@@ -176,7 +176,7 @@ Binlog_cache_use	0
 *** the following must show the counter value = 1 ***
 Variable_name	Value
 Binlog_cache_use	1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b char(255)) engine=innodb
 master-bin.000001	#	Query	#	#	use `test`; flush status
@@ -282,7 +282,7 @@ master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 3, 'just to fil
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 2, 'just to fill void to make transaction occupying at least two buffers of the trans cache' )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 1, 'just to fill void to make transaction occupying at least two buffers of the trans cache' )
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -295,7 +295,7 @@ set @b= 14632475938453979136;
 execute stmt using @a, @b;
 deallocate prepare stmt;
 drop table t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -325,7 +325,7 @@ END//
 CALL p1();
 c1	c2	c3	d1	d2	d3
 utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	2	2	2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
 master-bin.000001	#	Query	#	#	use `bug39182`; CREATE TABLE t1 (a VARCHAR(255) COLLATE utf8_unicode_ci)
@@ -404,7 +404,7 @@ INSERT INTO user SET host='localhost', user='@#@', password=password('Just a tes
 UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@';
 DELETE FROM user WHERE host='localhost' AND user='@#@';
 use test;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -431,7 +431,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207);
 insert /*! delayed */ into t1 values (null);
 insert delayed into t1 values (300);
 FLUSH TABLES;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -452,7 +452,7 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_stm_blackhole.result

@@ -107,7 +107,7 @@ select * from t2;
 a
 select * from t3;
 a
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=blackhole

mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result

@@ -3,7 +3,7 @@ create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	User var	#	#	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

mysql-test/suite/binlog/r/binlog_stm_do_db.result

@@ -32,7 +32,7 @@ INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED.
 COMMIT;
 ### assertion: filtered events did not make into the binlog
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE b42829
 master-bin.000001	#	Query	#	#	use `b42829`; CREATE TABLE t1 (x int, y int) engine=InnoDB

mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result

@@ -6,7 +6,7 @@ BEGIN;
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;;
 COMMIT;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result

@@ -23,7 +23,7 @@ USE test;
 SELECT GET_LOCK("a",10);
 GET_LOCK("a",10)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE `drop-temp+table-test`
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; CREATE TEMPORARY TABLE shortn1 (a INT)
@@ -52,7 +52,7 @@ INSERT INTO t1 VALUES ('1');
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i text )
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE ttmp1 ( i text )

mysql-test/suite/binlog/r/binlog_stm_insert_select.result

@@ -6,7 +6,7 @@ insert into t2 values(1),(2);
 reset master;
 insert into t1 select * from t2;
 ERROR 23000: Duplicate entry '2' for key 'a'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 select * from t2
@@ -21,6 +21,5 @@ insert into t1 values(1),(1);
 reset master;
 create table t2(unique(a)) select a from t1;
 ERROR 23000: Duplicate entry '1' for key 'a'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 drop table t1;

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

@@ -10,7 +10,7 @@ insert into t2 select * from t1;
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table, and writes to any of them.
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(1)
@@ -27,7 +27,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(2)
@@ -47,7 +47,7 @@ rollback to savepoint my_savepoint;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(3)
@@ -75,7 +75,7 @@ select a from t1 order by a;
 a
 5
 7
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(5)
@@ -99,7 +99,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 select get_lock("a",10);
 get_lock("a",10)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(8)
@@ -110,7 +110,7 @@ delete from t2;
 reset master;
 insert into t1 values(9);
 insert into t2 select * from t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(9)
@@ -124,7 +124,7 @@ reset master;
 insert into t1 values(10);
 begin;
 insert into t2 select * from t1;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(10)
@@ -134,7 +134,7 @@ master-bin.000001	#	Query	#	#	use `test`; insert into t2 select * from t1
 master-bin.000001	#	Query	#	#	COMMIT
 insert into t1 values(11);
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(10)
@@ -153,7 +153,7 @@ begin;
 insert into t1 values(12);
 insert into t2 select * from t1;
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(12)
@@ -166,8 +166,7 @@ begin;
 insert into t1 values(13);
 insert into t2 select * from t1;
 rollback;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 delete from t1;
 delete from t2;
 reset master;
@@ -178,10 +177,11 @@ insert into t1 values(15);
 insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(14)
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 delete from t1;
 delete from t2;
@@ -198,10 +198,11 @@ select a from t1 order by a;
 a
 16
 18
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(16)
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(18)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 delete from t1;
@@ -251,10 +252,11 @@ insert into t2 values (3);
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(16)
+master-bin.000001	#	Query	#	#	SAVEPOINT `my_savepoint`
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(18)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
@@ -378,7 +380,7 @@ SELECT * from t2;
 a	b
 100	100
 DROP TABLE t1,t2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (1,1),(1,2)
@@ -461,7 +463,7 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select count(*) from tt /* 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
@@ -487,7 +489,7 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
@@ -523,7 +525,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 reset master;
 insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=3
@@ -543,7 +545,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 select count(*) from t2 /* nothing got deleted */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=4
@@ -570,7 +572,7 @@ insert into t2 values (1);
 reset master;
 insert into t2 values (bug27417(1));
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=1
@@ -586,7 +588,7 @@ insert into t2 values (2);
 reset master;
 insert into t2 select bug27417(1) union select bug27417(2);
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=2
@@ -601,7 +603,7 @@ insert into t3 values (1,1),(2,3),(3,4);
 reset master;
 update t3 set b=b+bug27417(1);
 ERROR 23000: Duplicate entry '4' for key 'b'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=4
@@ -618,7 +620,7 @@ insert into t4 values (1,1),(2,2);
 reset master;
 UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=6
@@ -650,7 +652,7 @@ insert into t3 values (bug27417(1), 2);
 reset master;
 delete from t2;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=9
@@ -671,7 +673,7 @@ insert into t5 values (1),(2);
 reset master;
 delete t2.* from t2,t5 where t2.a=t5.a + 1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; delete t2.* from t2,t5 where t2.a=t5.a + 1
@@ -692,7 +694,7 @@ a	b
 select count(*) from t1 /* must be 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
@@ -719,7 +721,7 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select count(*) from tt /* 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
@@ -745,7 +747,7 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 rollback;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
@@ -781,7 +783,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 reset master;
 insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=3
@@ -800,7 +802,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 select count(*) from t2 /* nothing got deleted */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=4
@@ -826,7 +828,7 @@ insert into t2 values (1);
 reset master;
 insert into t2 values (bug27417(1));
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=1
@@ -841,7 +843,7 @@ insert into t2 values (2);
 reset master;
 insert into t2 select bug27417(1) union select bug27417(2);
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=2
@@ -855,7 +857,7 @@ insert into t3 values (1,1),(2,3),(3,4);
 reset master;
 update t3 set b=b+bug27417(1);
 ERROR 23000: Duplicate entry '4' for key 'b'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=4
@@ -871,7 +873,7 @@ insert into t4 values (1,1),(2,2);
 reset master;
 UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=6
@@ -902,7 +904,7 @@ insert into t3 values (bug27417(1), 2);
 reset master;
 delete from t2;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=9
@@ -922,7 +924,7 @@ insert into t5 values (1),(2);
 reset master;
 delete t2.* from t2,t5 where t2.a=t5.a + 1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; delete t2.* from t2,t5 where t2.a=t5.a + 1
@@ -942,7 +944,7 @@ a	b
 select count(*) from t1 /* must be 2 */;
 count(*)
 2
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10

mysql-test/suite/binlog/r/binlog_stm_ps.result

@@ -12,7 +12,7 @@ set @a=100;
 execute s using @a;
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Query	#	#	BEGIN

mysql-test/suite/binlog/r/binlog_stm_row.result

@@ -57,7 +57,7 @@ RELEASE_LOCK('Bug#34306')
 # con2
 # default
 # Show binlog events
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */

mysql-test/suite/binlog/r/binlog_stm_user_variables.result

@@ -37,7 +37,7 @@ INSERT INTO t1 VALUES (@positive,
 ## assertion: checks that User_var_log_event::pack_info 
 ## correctly displays the binlog content by taking into 
 ## account the unsigned_flag
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (`tinyint` TINYINT,
 `smallint` SMALLINT,
@@ -96,7 +96,7 @@ INSERT INTO t1 VALUES (@negative,
 ## assertion: checks that User_var_log_event::pack_info 
 ## correctly displays the binlog content by taking into 
 ## account the unsigned_flag
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (`tinyint` TINYINT,
 `smallint` SMALLINT,

mysql-test/suite/binlog/r/binlog_truncate_myisam.result

@@ -7,7 +7,7 @@ INSERT INTO t2 VALUES (1),(2),(3);
 **** Truncate of empty table shall be logged
 TRUNCATE TABLE t1;
 TRUNCATE TABLE t2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t1
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t2
@@ -38,7 +38,7 @@ SELECT COUNT(*) FROM t2;
 COUNT(*)
 4
 # Connection: default
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -58,7 +58,7 @@ INSERT INTO t2 VALUES (1),(2),(3);
 **** Truncate of empty table shall be logged
 TRUNCATE TABLE t1;
 TRUNCATE TABLE t2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t1
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t2
@@ -89,7 +89,7 @@ SELECT COUNT(*) FROM t2;
 COUNT(*)
 4
 # Connection: default
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 SELECT * FROM t1

mysql-test/suite/binlog/r/binlog_unsafe.result

@@ -2515,7 +2515,7 @@ CALL proc_insert_delayed();
 SELECT func_limit();
 func_limit()
 1
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT DELAYED INTO t1 VALUES (1), (2)
@@ -2545,7 +2545,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 SET SESSION binlog_format = MIXED;
 # Check if the statement is logged in row format.
 INSERT INTO t2 SET a = func_modify_t1();
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -2572,7 +2572,7 @@ Note	1592	Unsafe statement written to the binary log using statement format sinc
 SET SESSION binlog_format = MIXED;
 # Check if the statement is logged in row format.
 INSERT INTO t1 SET a = 2;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

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

@@ -152,7 +152,6 @@ def	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci
 def	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
 def	mysql	slave_master_info	Bind	18	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references	Displays which interface is employed when connecting to the MySQL server
 def	mysql	slave_master_info	Connect_retry	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references	The period (in seconds) that the slave will wait before trying to reconnect to the master.
-def	mysql	slave_master_info	Enabled_auto_position	24	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select,insert,update,references	Indicates whether GTIDs will be used to retrieve events from the master.
 def	mysql	slave_master_info	Enabled_ssl	10	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select,insert,update,references	Indicates whether the server supports SSL connections.
 def	mysql	slave_master_info	Heartbeat	17	NULL	NO	float	NULL	NULL	12	NULL	NULL	NULL	NULL	float			select,insert,update,references	
 def	mysql	slave_master_info	Host	5	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references	The host name of the master.
@@ -512,7 +511,6 @@ NULL	mysql	slave_master_info	Heartbeat	float	NULL	NULL	NULL	NULL	float
 NULL	mysql	slave_master_info	Retry_count	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 1.0000	mysql	slave_master_info	Ssl_crl	text	65535	65535	utf8	utf8_bin	text
 1.0000	mysql	slave_master_info	Ssl_crlpath	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Enabled_auto_position	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 NULL	mysql	slave_relay_log_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	slave_relay_log_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int(10) unsigned
 1.0000	mysql	slave_relay_log_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text

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

@@ -37,7 +37,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
@@ -110,7 +110,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
@@ -173,7 +173,7 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -188,7 +188,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -212,7 +212,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID		HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID		HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -236,7 +236,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -276,7 +276,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -302,7 +302,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -356,7 +356,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -385,7 +385,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -414,7 +414,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
@@ -450,7 +450,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000

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

@@ -33,7 +33,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	<TIME_MS>
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST	<TIME_MS>
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -81,7 +81,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -114,7 +114,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -133,7 +133,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
 # ----- switch to connection default (user = root) -----
 
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -159,7 +159,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17	0.000
 SELECT STATE, TIME, INFO INTO @state, @time, @info

mysql-test/suite/innodb/r/innodb.result

@@ -1314,7 +1314,7 @@ FOREIGN KEY (c1) REFERENCES t1 (c1) ON UPDATE CASCADE
 INSERT INTO t1 VALUES ('old', 'somevalu'), ('other', 'anyvalue');
 INSERT INTO t2 VALUES (10, 'old'), (20, 'other');
 UPDATE t1 SET c1 = 'other' WHERE c1 = 'old';
-ERROR 23000: Upholding foreign key constraints for table 't1', entry 'other-somevalu', key 2 would lead to a duplicate entry
+ERROR 23000: Foreign key constraint for table 't1', record 'other-somevalu' would lead to a duplicate entry in table 't2', key 'c1'
 DROP TABLE t2,t1;
 create table t1(
 id int primary key,
@@ -2726,7 +2726,7 @@ INSERT INTO t1 VALUES ('other', 'anyvalue');
 INSERT INTO t2 VALUES ('old');
 INSERT INTO t2 VALUES ('other');
 UPDATE t1 SET field1 = 'other' WHERE field2 = 'somevalu';
-ERROR 23000: Upholding foreign key constraints for table 't1', entry 'other-somevalu', key 1 would lead to a duplicate entry
+ERROR 23000: Foreign key constraint for table 't1', record 'other-somevalu' would lead to a duplicate entry in table 't2', key 'PRIMARY'
 DROP TABLE t2;
 DROP TABLE t1;
 create table t1 (

mysql-test/suite/innodb/r/innodb_bug12661768.result

@@ -1,2 +1,2 @@
 SET SESSION foreign_key_checks=0;
-ERROR 23000: Upholding foreign key constraints for table 'bug12661768_1', entry '3-bbb', key 2 would lead to a duplicate entry
+ERROR 23000: Foreign key constraint for table 'bug12661768_1', record '3-bbb' would lead to a duplicate entry in table 'bug12661768_2', key 'ab_on_2'

mysql-test/suite/innodb/r/innodb_bug53592.result

@@ -38,6 +38,6 @@ INSERT INTO bug53592_1 VALUES (3, 4);
 INSERT INTO bug53592_2 VALUES (1);
 INSERT INTO bug53592_2 VALUES (3);
 UPDATE bug53592_1 SET col1 = 3 WHERE col2 = 2;
-ERROR 23000: Upholding foreign key constraints for table 'bug53592_1', entry '3-2', key 1 would lead to a duplicate entry
+ERROR 23000: Foreign key constraint for table 'bug53592_1', record '3-2' would lead to a duplicate entry in table 'bug53592_2', key 'PRIMARY'
 drop table bug53592_2;
 drop table bug53592_1;

mysql-test/suite/innodb/t/innodb.test

@@ -1064,7 +1064,7 @@ CREATE TABLE t2 (
 
 INSERT INTO t1 VALUES ('old', 'somevalu'), ('other', 'anyvalue');
 INSERT INTO t2 VALUES (10, 'old'), (20, 'other');
--- error ER_FOREIGN_DUPLICATE_KEY
+--error ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO
 UPDATE t1 SET c1 = 'other' WHERE c1 = 'old';
 DROP TABLE t2,t1;
 
@@ -1945,7 +1945,7 @@ INSERT INTO t1 VALUES ('other', 'anyvalue');
 INSERT INTO t2 VALUES ('old');
 INSERT INTO t2 VALUES ('other');
 
---error ER_FOREIGN_DUPLICATE_KEY
+--error ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO
 UPDATE t1 SET field1 = 'other' WHERE field2 = 'somevalu';
 
 DROP TABLE t2;

mysql-test/suite/innodb/t/innodb_bug12661768.test

@@ -44,7 +44,7 @@ SET SESSION foreign_key_checks=1;
 
 -- enable_result_log
 
--- error ER_FOREIGN_DUPLICATE_KEY
+-- error ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO
 eval UPDATE IGNORE `$t1_name` SET a = 3;
 
 eval DROP TABLE `$t2_name`, `$t1_name`;

mysql-test/suite/innodb/t/innodb_bug53592.test

@@ -75,7 +75,7 @@ INSERT INTO bug53592_1 VALUES (3, 4);
 INSERT INTO bug53592_2 VALUES (1);
 INSERT INTO bug53592_2 VALUES (3);
 
---error ER_FOREIGN_DUPLICATE_KEY
+--error ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO
 UPDATE bug53592_1 SET col1 = 3 WHERE col2 = 2;
 
 drop table bug53592_2;

mysql-test/suite/perfschema/disabled.def

@@ -10,22 +10,41 @@
 #
 ##############################################################################
 
-hostcache_ipv6_addrinfo_again_allow: Need --bind-addr
+ddl_host_cache:
-hostcache_ipv6_addrinfo_again_deny: Need --bind-addr
+dml_host_cache:
-hostcache_ipv6_addrinfo_bad_allow: Need --bind-addr
+hostcache_ipv4_addrinfo_again_allow:
-hostcache_ipv6_addrinfo_bad_deny: Need --bind-addr
+hostcache_ipv4_addrinfo_again_deny:
-hostcache_ipv6_addrinfo_good_allow: Need --bind-addr
+hostcache_ipv4_addrinfo_bad_allow:
-hostcache_ipv6_addrinfo_good_deny: Need --bind-addr
+hostcache_ipv4_addrinfo_bad_deny:
-hostcache_ipv6_addrinfo_noname_allow: Need --bind-addr
+hostcache_ipv4_addrinfo_good_allow:
-hostcache_ipv6_addrinfo_noname_deny: Need --bind-addr
+hostcache_ipv4_addrinfo_good_deny:
-hostcache_ipv6_auth_plugin: Need --bind-addr
+hostcache_ipv4_addrinfo_noname_allow:
-hostcache_ipv6_blocked: Need --bind-addr
+hostcache_ipv4_addrinfo_noname_deny:
-hostcache_ipv6_max_con: Need --bind-addr
+hostcache_ipv4_auth_plugin:
-hostcache_ipv6_nameinfo_again_allow: Need --bind-addr
+hostcache_ipv4_blocked:
-hostcache_ipv6_nameinfo_again_deny: Need --bind-addr
+hostcache_ipv4_format:
-hostcache_ipv6_nameinfo_noname_allow: Need --bind-addr
+hostcache_ipv4_max_con:
-hostcache_ipv6_nameinfo_noname_deny: Need --bind-addr
+hostcache_ipv4_nameinfo_again_allow:
-hostcache_ipv6_passwd: Need --bind-addr
+hostcache_ipv4_nameinfo_again_deny:
-hostcache_ipv6_ssl: Need --bind-addr
+hostcache_ipv4_nameinfo_noname_allow:
-hostcache_ipv4_auth_plugin: need hostcache
+hostcache_ipv4_nameinfo_noname_deny:
-hostcache_ipv6_auth_plugin: need hostcache
+hostcache_ipv4_passwd:
+hostcache_ipv4_ssl:
+hostcache_ipv6_addrinfo_again_allow:
+hostcache_ipv6_addrinfo_again_deny:
+hostcache_ipv6_addrinfo_bad_allow:
+hostcache_ipv6_addrinfo_bad_deny:
+hostcache_ipv6_addrinfo_good_allow:
+hostcache_ipv6_addrinfo_good_deny:
+hostcache_ipv6_addrinfo_noname_allow:
+hostcache_ipv6_addrinfo_noname_deny:
+hostcache_ipv6_auth_plugin:
+hostcache_ipv6_blocked:
+hostcache_ipv6_max_con:
+hostcache_ipv6_nameinfo_again_allow:
+hostcache_ipv6_nameinfo_again_deny:
+hostcache_ipv6_nameinfo_noname_allow:
+hostcache_ipv6_nameinfo_noname_deny:
+hostcache_ipv6_passwd:
+hostcache_ipv6_ssl:
+hostcache_peer_addr:

mysql-test/suite/perfschema/include/schema.inc

@@ -38,6 +38,7 @@ show create table events_waits_summary_global_by_event_name;
 show create table file_instances;
 show create table file_summary_by_event_name;
 show create table file_summary_by_instance;
+--error 1146
 show create table host_cache;
 show create table hosts;
 show create table mutex_instances;

mysql-test/suite/perfschema/include/start_server_common.inc

@@ -43,6 +43,7 @@ select * from performance_schema.events_waits_summary_global_by_event_name;
 select * from performance_schema.file_instances;
 select * from performance_schema.file_summary_by_event_name;
 select * from performance_schema.file_summary_by_instance;
+--error 1146
 select * from performance_schema.host_cache;
 select * from performance_schema.socket_instances;
 select * from performance_schema.socket_summary_by_instance;

mysql-test/suite/perfschema/r/binlog_mix.result

@@ -26,10 +26,6 @@ update performance_schema.setup_instruments set enabled='YES'
   and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.setup_instruments)
-master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table test.t1 (thread_id integer)
@@ -44,7 +40,3 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.setup_instruments)
-master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT

mysql-test/suite/perfschema/r/binlog_row.result

@@ -26,10 +26,6 @@ update performance_schema.setup_instruments set enabled='YES'
   and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.setup_instruments)
-master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table test.t1 (thread_id integer)
@@ -44,7 +40,3 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.setup_instruments)
-master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT

mysql-test/suite/perfschema/r/binlog_stmt.result

@@ -20,12 +20,14 @@ insert into test.t1
 select thread_id from performance_schema.events_waits_current;
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Mixing self-logging and non-self-logging engines in a statement is unsafe.
 insert into test.t2
 select name from performance_schema.setup_instruments
 where name like "wait/synch/rwlock/sql/%"
     and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Mixing self-logging and non-self-logging engines in a statement is unsafe.
 drop table test.t1;
 drop table test.t2;
 update performance_schema.setup_instruments set enabled='YES'

mysql-test/suite/perfschema/r/digest_table_full.result

@@ -76,7 +76,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	29	21	1	2
-dee8f4f04e57a5e456c31892855e6835	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
+d238cb191361f39845a6adb2961f5501	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
 SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2

mysql-test/suite/perfschema/r/dml_handler.result

@@ -9,63 +9,60 @@ SELECT COUNT(*) FROM table_list INTO @table_count;
 # For each table in the performance schema, attempt HANDLER...OPEN,
 # which should fail with an error 1031, ER_ILLEGAL_HA.
 
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
 HANDLER performance_schema.users OPEN;
 ERROR HY000: Table storage engine for 'users' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
 HANDLER performance_schema.threads OPEN;
 ERROR HY000: Table storage engine for 'threads' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
 HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
 ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
 HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
 ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
 HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
 ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
 HANDLER performance_schema.socket_summary_by_instance OPEN;
 ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
 HANDLER performance_schema.socket_summary_by_event_name OPEN;
 ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
 HANDLER performance_schema.socket_instances OPEN;
 ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
 HANDLER performance_schema.setup_timers OPEN;
 ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
 HANDLER performance_schema.setup_objects OPEN;
 ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
 HANDLER performance_schema.setup_instruments OPEN;
 ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
 HANDLER performance_schema.setup_consumers OPEN;
 ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
 HANDLER performance_schema.setup_actors OPEN;
 ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
 HANDLER performance_schema.rwlock_instances OPEN;
 ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
 HANDLER performance_schema.performance_timers OPEN;
 ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
 HANDLER performance_schema.objects_summary_global_by_type OPEN;
 ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
 HANDLER performance_schema.mutex_instances OPEN;
 ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
 HANDLER performance_schema.hosts OPEN;
 ERROR HY000: Table storage engine for 'hosts' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
-HANDLER performance_schema.host_cache OPEN;
-ERROR HY000: Table storage engine for 'host_cache' doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
 HANDLER performance_schema.file_summary_by_instance OPEN;
 ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option

mysql-test/suite/perfschema/r/dml_setup_instruments.result

@@ -11,9 +11,9 @@ wait/synch/mutex/sql/hash_filo::lock	YES	YES
 wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc	YES	YES
 wait/synch/mutex/sql/LOCK_active_mi	YES	YES
 wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
+wait/synch/mutex/sql/LOCK_commit_ordered	YES	YES
 wait/synch/mutex/sql/LOCK_connection_count	YES	YES
 wait/synch/mutex/sql/LOCK_crypt	YES	YES
-wait/synch/mutex/sql/LOCK_delayed_create	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Rwlock/sql/%'
   and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')

mysql-test/suite/perfschema/r/information_schema.result

@@ -33,7 +33,6 @@ performance_schema	events_waits_summary_global_by_event_name	def
 performance_schema	file_instances	def
 performance_schema	file_summary_by_event_name	def
 performance_schema	file_summary_by_instance	def
-performance_schema	host_cache	def
 performance_schema	hosts	def
 performance_schema	mutex_instances	def
 performance_schema	objects_summary_global_by_type	def
@@ -87,7 +86,6 @@ events_waits_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_instances	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_instance	BASE TABLE	PERFORMANCE_SCHEMA
-host_cache	BASE TABLE	PERFORMANCE_SCHEMA
 hosts	BASE TABLE	PERFORMANCE_SCHEMA
 mutex_instances	BASE TABLE	PERFORMANCE_SCHEMA
 objects_summary_global_by_type	BASE TABLE	PERFORMANCE_SCHEMA
@@ -141,7 +139,6 @@ events_waits_summary_global_by_event_name	10	Dynamic
 file_instances	10	Dynamic
 file_summary_by_event_name	10	Dynamic
 file_summary_by_instance	10	Dynamic
-host_cache	10	Dynamic
 hosts	10	Fixed
 mutex_instances	10	Dynamic
 objects_summary_global_by_type	10	Dynamic
@@ -195,7 +192,6 @@ events_waits_summary_global_by_event_name	1000	0
 file_instances	1000	0
 file_summary_by_event_name	1000	0
 file_summary_by_instance	1000	0
-host_cache	1000	0
 hosts	1000	0
 mutex_instances	1000	0
 objects_summary_global_by_type	1000	0
@@ -249,7 +245,6 @@ events_waits_summary_global_by_event_name	0	0
 file_instances	0	0
 file_summary_by_event_name	0	0
 file_summary_by_instance	0	0
-host_cache	0	0
 hosts	0	0
 mutex_instances	0	0
 objects_summary_global_by_type	0	0
@@ -303,7 +298,6 @@ events_waits_summary_global_by_event_name	0	0	NULL
 file_instances	0	0	NULL
 file_summary_by_event_name	0	0	NULL
 file_summary_by_instance	0	0	NULL
-host_cache	0	0	NULL
 hosts	0	0	NULL
 mutex_instances	0	0	NULL
 objects_summary_global_by_type	0	0	NULL
@@ -357,7 +351,6 @@ events_waits_summary_global_by_event_name	NULL	NULL	NULL
 file_instances	NULL	NULL	NULL
 file_summary_by_event_name	NULL	NULL	NULL
 file_summary_by_instance	NULL	NULL	NULL
-host_cache	NULL	NULL	NULL
 hosts	NULL	NULL	NULL
 mutex_instances	NULL	NULL	NULL
 objects_summary_global_by_type	NULL	NULL	NULL
@@ -411,7 +404,6 @@ events_waits_summary_global_by_event_name	utf8_general_ci	NULL
 file_instances	utf8_general_ci	NULL
 file_summary_by_event_name	utf8_general_ci	NULL
 file_summary_by_instance	utf8_general_ci	NULL
-host_cache	utf8_general_ci	NULL
 hosts	utf8_general_ci	NULL
 mutex_instances	utf8_general_ci	NULL
 objects_summary_global_by_type	utf8_general_ci	NULL
@@ -465,7 +457,6 @@ events_waits_summary_global_by_event_name
 file_instances	
 file_summary_by_event_name	
 file_summary_by_instance	
-host_cache	
 hosts	
 mutex_instances	
 objects_summary_global_by_type	

mysql-test/suite/perfschema/r/misc.result

@@ -42,12 +42,12 @@ AND EVENT_NAME IN
 WHERE NAME LIKE "wait/synch/%")
 LIMIT 1;
 create table test.t1(a int) engine=performance_schema;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema='test';
 object_schema	object_name
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema='test';
 object_schema	object_name

mysql-test/suite/perfschema/r/nesting.result

@@ -181,53 +181,51 @@ select "With a third part to make things complete" as payload	NULL	NULL
 70	70	stage/sql/closing tables	(stage)	STATEMENT	57
 71	72	stage/sql/freeing items	(stage)	STATEMENT	57
 72	72	wait/io/socket/sql/client_connection	send	STAGE	71
-73	86	statement/sql/select	select "And this is the second part of a multi query" as payload;
+73	85	statement/sql/select	select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-74	76	stage/sql/init	(stage)	STATEMENT	73
+74	75	stage/sql/init	(stage)	STATEMENT	73
 75	75	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	74
-76	76	wait/io/file/sql/query_log	write	STAGE	74
+76	76	stage/sql/checking permissions	(stage)	STATEMENT	73
-77	77	stage/sql/checking permissions	(stage)	STATEMENT	73
+77	77	stage/sql/Opening tables	(stage)	STATEMENT	73
-78	78	stage/sql/Opening tables	(stage)	STATEMENT	73
+78	78	stage/sql/init	(stage)	STATEMENT	73
-79	79	stage/sql/init	(stage)	STATEMENT	73
+79	79	stage/sql/optimizing	(stage)	STATEMENT	73
-80	80	stage/sql/optimizing	(stage)	STATEMENT	73
+80	80	stage/sql/executing	(stage)	STATEMENT	73
-81	81	stage/sql/executing	(stage)	STATEMENT	73
+81	81	stage/sql/end	(stage)	STATEMENT	73
-82	82	stage/sql/end	(stage)	STATEMENT	73
+82	82	stage/sql/query end	(stage)	STATEMENT	73
-83	83	stage/sql/query end	(stage)	STATEMENT	73
+83	83	stage/sql/closing tables	(stage)	STATEMENT	73
-84	84	stage/sql/closing tables	(stage)	STATEMENT	73
+84	85	stage/sql/freeing items	(stage)	STATEMENT	73
-85	86	stage/sql/freeing items	(stage)	STATEMENT	73
+85	85	wait/io/socket/sql/client_connection	send	STAGE	84
-86	86	wait/io/socket/sql/client_connection	send	STAGE	85
+86	100	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
-87	102	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
+87	88	stage/sql/init	(stage)	STATEMENT	86
-88	90	stage/sql/init	(stage)	STATEMENT	87
+88	88	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	87
-89	89	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	88
+89	89	stage/sql/checking permissions	(stage)	STATEMENT	86
-90	90	wait/io/file/sql/query_log	write	STAGE	88
+90	90	stage/sql/Opening tables	(stage)	STATEMENT	86
-91	91	stage/sql/checking permissions	(stage)	STATEMENT	87
+91	91	stage/sql/init	(stage)	STATEMENT	86
-92	92	stage/sql/Opening tables	(stage)	STATEMENT	87
+92	92	stage/sql/optimizing	(stage)	STATEMENT	86
-93	93	stage/sql/init	(stage)	STATEMENT	87
+93	93	stage/sql/executing	(stage)	STATEMENT	86
-94	94	stage/sql/optimizing	(stage)	STATEMENT	87
+94	94	stage/sql/end	(stage)	STATEMENT	86
-95	95	stage/sql/executing	(stage)	STATEMENT	87
+95	95	stage/sql/query end	(stage)	STATEMENT	86
-96	96	stage/sql/end	(stage)	STATEMENT	87
+96	96	stage/sql/closing tables	(stage)	STATEMENT	86
-97	97	stage/sql/query end	(stage)	STATEMENT	87
+97	98	stage/sql/freeing items	(stage)	STATEMENT	86
-98	98	stage/sql/closing tables	(stage)	STATEMENT	87
+98	98	wait/io/socket/sql/client_connection	send	STAGE	97
-99	100	stage/sql/freeing items	(stage)	STATEMENT	87
+99	100	stage/sql/cleaning up	(stage)	STATEMENT	86
-100	100	wait/io/socket/sql/client_connection	send	STAGE	99
+100	100	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	99
-101	102	stage/sql/cleaning up	(stage)	STATEMENT	87
+101	101	idle	idle	NULL	NULL
-102	102	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	101
+102	119	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
-103	103	idle	idle	NULL	NULL
+103	107	stage/sql/init	(stage)	STATEMENT	102
-104	121	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
+104	104	wait/io/socket/sql/client_connection	recv	STAGE	103
-105	109	stage/sql/init	(stage)	STATEMENT	104
+105	105	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	103
-106	106	wait/io/socket/sql/client_connection	recv	STAGE	105
+106	106	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	103
-107	107	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	105
+107	107	wait/io/file/sql/query_log	write	STAGE	103
-108	108	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	105
+108	108	stage/sql/checking permissions	(stage)	STATEMENT	102
-109	109	wait/io/file/sql/query_log	write	STAGE	105
+109	109	stage/sql/Opening tables	(stage)	STATEMENT	102
-110	110	stage/sql/checking permissions	(stage)	STATEMENT	104
+110	110	stage/sql/init	(stage)	STATEMENT	102
-111	111	stage/sql/Opening tables	(stage)	STATEMENT	104
+111	111	stage/sql/optimizing	(stage)	STATEMENT	102
-112	112	stage/sql/init	(stage)	STATEMENT	104
+112	112	stage/sql/executing	(stage)	STATEMENT	102
-113	113	stage/sql/optimizing	(stage)	STATEMENT	104
+113	113	stage/sql/end	(stage)	STATEMENT	102
-114	114	stage/sql/executing	(stage)	STATEMENT	104
+114	114	stage/sql/query end	(stage)	STATEMENT	102
-115	115	stage/sql/end	(stage)	STATEMENT	104
+115	115	stage/sql/closing tables	(stage)	STATEMENT	102
-116	116	stage/sql/query end	(stage)	STATEMENT	104
+116	117	stage/sql/freeing items	(stage)	STATEMENT	102
-117	117	stage/sql/closing tables	(stage)	STATEMENT	104
+117	117	wait/io/socket/sql/client_connection	send	STAGE	116
-118	119	stage/sql/freeing items	(stage)	STATEMENT	104
+118	119	stage/sql/cleaning up	(stage)	STATEMENT	102
-119	119	wait/io/socket/sql/client_connection	send	STAGE	118
+119	119	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	118
-120	121	stage/sql/cleaning up	(stage)	STATEMENT	104
-121	121	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	120

mysql-test/suite/perfschema/r/ortho_iter.result

@@ -115,7 +115,7 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
+performance_schema_max_statement_classes	170
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/pfs_upgrade.result

@@ -8,59 +8,56 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 699: Table 'threads' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1134: Table 'users' already exists
+ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
-ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists
-ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -73,59 +70,56 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 699: Table 'threads' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1134: Table 'users' already exists
+ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
-ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists
-ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -136,59 +130,56 @@ drop view test.user_view;
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 699: Table 'threads' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1134: Table 'users' already exists
+ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
-ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists
-ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -199,59 +190,56 @@ drop procedure test.user_proc;
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 699: Table 'threads' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1134: Table 'users' already exists
+ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
-ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists
-ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -262,59 +250,56 @@ drop function test.user_func;
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
 update mysql.event set db='performance_schema' where name='user_event';
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-Warning: Using a password on the command line interface can be insecure.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 100: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 125: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 150: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 175: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 188: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 201: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 214: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 228: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 241: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 253: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 288: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 262: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 291: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 699: Table 'threads' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 864: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 910: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 956: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 988: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1020: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1085: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1125: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1134: Table 'users' already exists
+ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
-ERROR 1050 (42S01) at line 1144: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1178: Table 'events_statements_summary_by_digest' already exists
-ERROR 1644 (HY000) at line 1598: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

mysql-test/suite/perfschema/r/privilege.result

@@ -152,13 +152,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
@@ -250,13 +250,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
@@ -348,13 +348,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
@@ -446,13 +446,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'

mysql-test/suite/perfschema/r/privilege_table_io.result

@@ -40,7 +40,7 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
+performance_schema_max_statement_classes	170
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/relaylog.result

@@ -1,7 +1,4 @@
 include/master-slave.inc
-Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 drop table if exists test.t1;
 reset master;
@@ -23,7 +20,7 @@ from performance_schema.file_summary_by_instance
 where file_name like "%master-%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+master-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
 select * from performance_schema.file_summary_by_instance
 where file_name like "%slave-%" order by file_name;
 FILE_NAME	EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
@@ -39,7 +36,7 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+master-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -50,7 +47,7 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_index	MANY	NONE	NONE	NONE
+wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -60,6 +57,7 @@ where event_name like "%MYSQL_BIN_LOG%"
   order by event_name;
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids	NONE
+wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	NONE
 "Expect no slave relay log"
@@ -76,6 +74,7 @@ where event_name like "%MYSQL_RELAY_LOG%"
   and event_name not like "%MYSQL_RELAY_LOG::update_cond"
   order by event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
+wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy	0	0	0	0	0
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	0	0	0	0	0
 "============ Performance schema on slave ============"
 select * from performance_schema.file_summary_by_instance
@@ -96,10 +95,10 @@ where file_name like "%slave-%"
 order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
 slave-relay-bin.000001	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.000002	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
-slave-relay-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-relay-bin.index	wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
 "Expect a slave binlog + binlog_index"
 select
 substring(file_name, locate("slave-", file_name)) as FILE_NAME,
@@ -112,8 +111,7 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
-slave-relay-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -124,7 +122,7 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
+wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -134,6 +132,7 @@ where event_name like "%MYSQL_BIN_LOG%"
   order by event_name;
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids	NONE
+wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	NONE
 "Expect a slave relay log"
@@ -153,6 +152,7 @@ order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-relay-bin.000001	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.000002	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
+slave-relay-bin.index	wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -163,7 +163,7 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%relaylog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
-wait/io/file/sql/relaylog_index	MANY	NONE	NONE	NONE
+wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -172,5 +172,6 @@ where event_name like "%MYSQL_RELAY_LOG%"
   and event_name not like "%MYSQL_RELAY_LOG::update_cond"
   order by event_name;
 EVENT_NAME	COUNT_STAR
+wait/synch/cond/sql/MYSQL_RELAY_LOG::COND_queue_busy	NONE
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	MANY
 include/stop_slave.inc