perfschema compilation, test and misc fixes

.gitignore

@@ -221,6 +221,7 @@ storage/myisam/myisamlog
 storage/myisam/myisampack
 storage/myisam/rt_test
 storage/myisam/sp_test
+storage/perfschema/pfs_config.h
 storage/rocksdb/ldb
 storage/rocksdb/myrocks_hotbackup
 storage/rocksdb/mysql_ldb

include/my_pthread.h

@@ -116,7 +116,7 @@ int pthread_cancel(pthread_t thread);
 #define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
 #define pthread_key_delete(A) TlsFree(A)
 #define my_pthread_setspecific_ptr(T,V) (!TlsSetValue((T),(V)))
-#define pthread_setspecific(A,B) (!TlsSetValue((A),(B)))
+#define pthread_setspecific(A,B) (!TlsSetValue((A),(LPVOID)(B)))
 #define pthread_getspecific(A) (TlsGetValue(A))
 #define my_pthread_getspecific(T,A) ((T) TlsGetValue(A))
 #define my_pthread_getspecific_ptr(T,V) ((T) TlsGetValue(V))

include/mysql/psi/mysql_mdl.h

@@ -30,10 +30,25 @@
 
 #include "mysql/psi/psi.h"
 
+#ifdef HAVE_PSI_METADATA_INTERFACE
+
 #ifndef PSI_METADATA_CALL
 #define PSI_METADATA_CALL(M) PSI_DYNAMIC_CALL(M)
 #endif
 
+#define PSI_CALL_start_metadata_wait(A,B,C,D) PSI_METADATA_CALL(start_metadata_wait)(A,B,C,D)
+#define PSI_CALL_end_metadata_wait(A,B) PSI_METADATA_CALL(end_metadata_wait)(A,B)
+#define PSI_CALL_create_metadata_lock(A,B,C,D,E,F,G) PSI_METADATA_CALL(create_metadata_lock)(A,B,C,D,E,F,G)
+#define PSI_CALL_set_metadata_lock_status(A,B) PSI_METADATA_CALL(set_metadata_lock_status)(A,B)
+#define PSI_CALL_destroy_metadata_lock(A) PSI_METADATA_CALL(destroy_metadata_lock)(A)
+#else
+#define PSI_CALL_start_metadata_wait(A,B,C,D) 0
+#define PSI_CALL_end_metadata_wait(A,B) do { } while(0)
+#define PSI_CALL_create_metadata_lock(A,B,C,D,E,F,G) 0
+#define PSI_CALL_set_metadata_lock_status(A,B) do {} while(0)
+#define PSI_CALL_destroy_metadata_lock(A) do {} while(0)
+#endif
+
 /**
   @defgroup Thread_instrumentation Metadata Instrumentation
   @ingroup Instrumentation_interface

include/mysql/psi/mysql_memory.h

@@ -30,6 +30,18 @@
 
 #include "mysql/psi/psi.h"
 
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+#define PSI_CALL_memory_alloc(A1,A2,A3) PSI_MEMORY_CALL(memory_alloc)(A1,A2,A3)
+#define PSI_CALL_memory_free(A1,A2,A3) PSI_MEMORY_CALL(memory_free)(A1,A2,A3)
+#define PSI_CALL_memory_realloc(A1,A2,A3,A4) PSI_MEMORY_CALL(memory_realloc)(A1,A2,A3,A4)
+#define PSI_CALL_register_memory(A1,A2,A3) PSI_MEMORY_CALL(register_memory)(A1,A2,A3)
+#else
+#define PSI_CALL_memory_alloc(A1,A2,A3) 0
+#define PSI_CALL_memory_free(A1,A2,A3) do { } while(0)
+#define PSI_CALL_memory_realloc(A1,A2,A3,A4) 0
+#define PSI_CALL_register_memory(A1,A2,A3) do { } while(0)
+#endif
+
 #ifndef PSI_MEMORY_CALL
 #define PSI_MEMORY_CALL(M) PSI_DYNAMIC_CALL(M)
 #endif
@@ -58,9 +70,7 @@ static inline void inline_mysql_memory_register(
   int count __attribute__((unused)))
 #endif
 {
-#ifdef HAVE_PSI_MEMORY_INTERFACE
-  PSI_MEMORY_CALL(register_memory)(category, info, count);
-#endif
+  PSI_CALL_register_memory(category, info, count);
 }
 
 /** @} (end of group Memory_instrumentation) */

include/mysql/psi/mysql_stage.h

@@ -89,10 +89,10 @@
   End the last stage
 */
 #ifdef HAVE_PSI_STAGE_INTERFACE
-  #define mysql_end_stage \
-    inline_mysql_end_stage
+  #define mysql_end_stage() \
+    inline_mysql_end_stage()
 #else
-  #define mysql_end_stage \
+  #define mysql_end_stage() \
   do {} while (0)
 #endif
 

include/mysql/psi/mysql_thread.h

@@ -96,26 +96,32 @@
 #define PSI_CALL_new_thread               PSI_THREAD_CALL(new_thread)
 #define PSI_CALL_register_thread          PSI_THREAD_CALL(register_thread)
 #define PSI_CALL_set_thread               PSI_THREAD_CALL(set_thread)
+#define PSI_CALL_set_thread_THD           PSI_THREAD_CALL(set_thread_THD)
 #define PSI_CALL_set_thread_connect_attrs PSI_THREAD_CALL(set_thread_connect_attrs)
 #define PSI_CALL_set_thread_db            PSI_THREAD_CALL(set_thread_db)
 #define PSI_CALL_set_thread_id            PSI_THREAD_CALL(set_thread_id)
+#define PSI_CALL_set_thread_os_id         PSI_THREAD_CALL(set_thread_os_id)
 #define PSI_CALL_set_thread_info          PSI_THREAD_CALL(set_thread_info)
 #define PSI_CALL_set_thread_start_time    PSI_THREAD_CALL(set_thread_start_time)
 #define PSI_CALL_set_thread_account       PSI_THREAD_CALL(set_thread_account)
 #define PSI_CALL_spawn_thread             PSI_THREAD_CALL(spawn_thread)
+#define PSI_CALL_set_connection_type      PSI_THREAD_CALL(set_connection_type)
 #else
 #define PSI_CALL_delete_current_thread()                do { } while(0)
 #define PSI_CALL_get_thread()                           NULL
 #define PSI_CALL_new_thread(A1,A2,A3)                   NULL
 #define PSI_CALL_register_thread(A1,A2,A3)              do { } while(0)
 #define PSI_CALL_set_thread(A1)                         do { } while(0)
+#define PSI_CALL_set_thread_THD(A1,A2)                  do { } while(0)
 #define PSI_CALL_set_thread_connect_attrs(A1,A2,A3)     0
 #define PSI_CALL_set_thread_db(A1,A2)                   do { } while(0)
 #define PSI_CALL_set_thread_id(A1,A2)                   do { } while(0)
+#define PSI_CALL_set_thread_os_id(A1)                   do { } while(0)
 #define PSI_CALL_set_thread_info(A1, A2)                do { } while(0)
 #define PSI_CALL_set_thread_start_time(A1)              do { } while(0)
 #define PSI_CALL_set_thread_account(A1, A2, A3, A4)     do { } while(0)
 #define PSI_CALL_spawn_thread(A1, A2, A3, A4, A5)       0
+#define PSI_CALL_set_connection_type(A)                 do { } while(0)
 #endif
 
 

include/mysql/psi/mysql_transaction.h

@@ -45,7 +45,7 @@
     inline_mysql_start_transaction(STATE, XID, TRXID, ISO, RO, AC, __FILE__, __LINE__)
 #else
   #define MYSQL_START_TRANSACTION(STATE, XID, TRXID, ISO, RO, AC) \
-    do {} while (0)
+    0
 #endif
 
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
@@ -109,7 +109,7 @@
     inline_mysql_rollback_transaction(LOCKER)
 #else
   #define MYSQL_ROLLBACK_TRANSACTION(LOCKER) \
-    NULL
+    do { } while(0)
 #endif
 
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
@@ -117,7 +117,7 @@
     inline_mysql_commit_transaction(LOCKER)
 #else
   #define MYSQL_COMMIT_TRANSACTION(LOCKER) \
-    NULL
+    do { } while(0)
 #endif
 
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE

include/mysql/psi/psi.h

@@ -23,10 +23,6 @@
 #ifndef MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H
 #define MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H
 
-#ifdef EMBEDDED_LIBRARY
-#define DISABLE_ALL_PSI
-#endif /* EMBEDDED_LIBRARY */
-
 #ifndef MY_GLOBAL_INCLUDED
 /*
   Make sure a .c or .cc file contains an include to my_global.h first.
@@ -55,6 +51,12 @@
 #include "psi_base.h"
 #include "psi_memory.h"
 
+#ifdef _WIN32
+typedef struct thread_attr pthread_attr_t;
+typedef DWORD pthread_t;
+typedef DWORD pthread_key_t;
+#endif
+
 /*
   MAINTAINER:
   The following pattern:
@@ -783,6 +785,7 @@ enum PSI_socket_operation
 };
 typedef enum PSI_socket_operation PSI_socket_operation;
 
+#endif
 /**
   Instrumented mutex key.
   To instrument a mutex, a mutex key must be obtained using @c register_mutex.
@@ -819,10 +822,7 @@ typedef unsigned int PSI_thread_key;
   To instrument a file, a file key must be obtained using @c register_file.
   Using a zero key always disable the instrumentation.
 */
-#ifndef PSI_FILE_KEY_DEFINED
 typedef unsigned int PSI_file_key;
-#define PSI_FILE_KEY_DEFINED
-#endif
 
 /**
   Instrumented stage key.
@@ -2967,7 +2967,7 @@ typedef struct PSI_sp_locker_state_v2 PSI_sp_locker_state;
 typedef struct PSI_metadata_locker_state_v2 PSI_metadata_locker_state;
 #endif
 
-#else /* HAVE_PSI_INTERFACE */
+#ifndef HAVE_PSI_INTERFACE
 
 /**
   Dummy structure, used to declare PSI_server when no instrumentation
@@ -3004,10 +3004,13 @@ struct PSI_stage_info_none
   with HAVE_PSI_INTERFACE.
 */
 typedef struct PSI_stage_info_none PSI_stage_info;
+typedef struct PSI_stage_info_none PSI_statement_info;
+typedef struct PSI_stage_info_none PSI_sp_locker_state;
+typedef struct PSI_stage_info_none PSI_metadata_locker_state;
+typedef struct PSI_stage_info_none PSI_metadata_locker;
 
 #endif /* HAVE_PSI_INTERFACE */
 
-extern MYSQL_PLUGIN_IMPORT my_bool pfs_enabled;
 extern MYSQL_PLUGIN_IMPORT PSI *PSI_server;
 
 /*

include/mysql/psi/psi_abi_v1.h.pp

@@ -851,6 +851,5 @@ typedef struct PSI_transaction_locker_state_v1 PSI_transaction_locker_state;
 typedef struct PSI_socket_locker_state_v1 PSI_socket_locker_state;
 typedef struct PSI_sp_locker_state_v1 PSI_sp_locker_state;
 typedef struct PSI_metadata_locker_state_v1 PSI_metadata_locker_state;
-extern MYSQL_PLUGIN_IMPORT my_bool pfs_enabled;
 extern MYSQL_PLUGIN_IMPORT PSI *PSI_server;
 C_MODE_END

include/mysql/psi/psi_abi_v2.h.pp

@@ -275,6 +275,5 @@ typedef struct PSI_transaction_locker_state_v2 PSI_transaction_locker_state;
 typedef struct PSI_socket_locker_state_v2 PSI_socket_locker_state;
 typedef struct PSI_sp_locker_state_v2 PSI_sp_locker_state;
 typedef struct PSI_metadata_locker_state_v2 PSI_metadata_locker_state;
-extern MYSQL_PLUGIN_IMPORT my_bool pfs_enabled;
 extern MYSQL_PLUGIN_IMPORT PSI *PSI_server;
 C_MODE_END

include/mysql/psi/psi_base.h

@@ -28,6 +28,10 @@
 #ifndef MYSQL_PSI_BASE_H
 #define MYSQL_PSI_BASE_H
 
+#ifdef EMBEDDED_LIBRARY
+#define DISABLE_ALL_PSI
+#endif /* EMBEDDED_LIBRARY */
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/mysql_com.h

@@ -25,8 +25,10 @@
 
 #define HOSTNAME_LENGTH 60
 #define SYSTEM_CHARSET_MBMAXLEN 3
-#define NAME_CHAR_LEN	64U             /* Field/table name length */
-#define USERNAME_CHAR_LENGTH 128U
+#define NAME_CHAR_LEN	64              /* Field/table name length */
+#define USERNAME_CHAR_LENGTH 128
+#define USERNAME_CHAR_LENGTH_STR STRINGIFY_ARG(USERNAME_CHAR_LENGTH)
+
 #define NAME_LEN                (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
 #define USERNAME_LENGTH         (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
 #define DEFINER_CHAR_LENGTH     (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 1)

include/pfs_file_provider.h

@@ -78,6 +78,9 @@ void pfs_start_file_close_wait_v1(PSI_file_locker *locker,
 
 void pfs_end_file_close_wait_v1(PSI_file_locker *locker, int rc);
 
+void pfs_end_file_rename_wait_v1(PSI_file_locker *locker, const char *old_name,
+                                 const char *new_name, int rc);
+
 C_MODE_END
 
 #endif /* EMBEDDED_LIBRARY */

mysql-test/include/default_mysqld.cnf

@@ -76,7 +76,13 @@ loose-performance-schema-max-cond-instances=1000
 loose-performance-schema-max-file-instances=10000
 loose-performance-schema-max-socket-instances=1000
 loose-performance-schema-max-table-instances=500
+loose-performance-schema-max-table-lock-stat=500
+loose-performance-schema-max-index-stat=5000
 loose-performance-schema-max-table-handles=1000
+loose-performance-schema-max-prepared-statements-instances=100
+loose-performance-schema-max-program-instances=5000
+loose-performance-schema-setup-actors-size=100
+loose-performance-schema-setup-objects-size=100
 
 loose-performance-schema-events-waits-history-size=10
 loose-performance-schema-events-waits-history-long-size=10000
@@ -84,8 +90,11 @@ loose-performance-schema-events-stages-history-size=10
 loose-performance-schema-events-stages-history-long-size=1000
 loose-performance-schema-events-statements-history-size=10
 loose-performance-schema-events-statements-history-long-size=1000
+loose-performance-schema-events-transactions-history-size=10
+loose-performance-schema-events-transactions-history-long-size=1000
 loose-performance-schema-max-thread-instances=200
 loose-performance-schema-session-connect-attrs-size=2048
+loose-performance-schema-max-metadata-locks=10000
 
 # Enable everything, for maximun code exposure during testing
 
@@ -97,6 +106,9 @@ 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-transactions-current=ON
+loose-performance-schema-consumer-events-transactions-history=ON
+loose-performance-schema-consumer-events-transactions-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

mysql-test/include/wait_for_sql_thread_read_all.inc

 --let $show_statement = show all slaves status
 --let $field = Slave_SQL_State
---let $condition = = 'Slave has read all relay log; waiting for the slave I/O thread to update it'
+--let $condition = = 'Slave has read all relay log; waiting for more updates'
 --let $wait_for_all = 1
 --source include/wait_show_condition.inc
 

mysql-test/main/mysqld--help.result

@@ -756,13 +756,21 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-consumer-events-statements-current 
  Default startup value for the events_statements_current
  consumer.
- (Defaults to on; use --skip-performance-schema-consumer-events-statements-current to disable.)
  --performance-schema-consumer-events-statements-history 
  Default startup value for the events_statements_history
  consumer.
  --performance-schema-consumer-events-statements-history-long 
  Default startup value for the
  events_statements_history_long consumer.
+ --performance-schema-consumer-events-transactions-current 
+ Default startup value for the events_transactions_current
+ consumer.
+ --performance-schema-consumer-events-transactions-history 
+ Default startup value for the events_transactions_history
+ consumer.
+ --performance-schema-consumer-events-transactions-history-long 
+ Default startup value for the
+ events_transactions_history_long consumer.
  --performance-schema-consumer-events-waits-current 
  Default startup value for the events_waits_current
  consumer.
@@ -798,6 +806,12 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-events-statements-history-size=# 
  Number of rows per thread in EVENTS_STATEMENTS_HISTORY.
  Use 0 to disable, -1 for automated sizing.
+ --performance-schema-events-transactions-history-long-size=# 
+ Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0
+ to disable, -1 for automated sizing.
+ --performance-schema-events-transactions-history-size=# 
+ Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY.
+ Use 0 to disable, -1 for automated sizing.
  --performance-schema-events-waits-history-long-size=# 
  Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to
  disable, -1 for automated sizing.
@@ -825,11 +839,25 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-max-file-instances=# 
  Maximum number of instrumented files. Use 0 to disable,
  -1 for automated sizing.
+ --performance-schema-max-index-stat=# 
+ Maximum number of index statistics for instrumented
+ tables. Use 0 to disable, -1 for automated scaling.
+ --performance-schema-max-memory-classes=# 
+ Maximum number of memory pool instruments.
+ --performance-schema-max-metadata-locks=# 
+ Maximum number of metadata locks. Use 0 to disable, -1
+ for automated scaling.
  --performance-schema-max-mutex-classes=# 
  Maximum number of mutex instruments.
  --performance-schema-max-mutex-instances=# 
  Maximum number of instrumented MUTEX objects. Use 0 to
  disable, -1 for automated sizing.
+ --performance-schema-max-prepared-statements-instances=# 
+ Maximum number of instrumented prepared statements. Use 0
+ to disable, -1 for automated scaling.
+ --performance-schema-max-program-instances=# 
+ Maximum number of instrumented programs. Use 0 to
+ disable, -1 for automated scaling.
  --performance-schema-max-rwlock-classes=# 
  Maximum number of rwlock instruments.
  --performance-schema-max-rwlock-instances=# 
@@ -840,16 +868,23 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-max-socket-instances=# 
  Maximum number of opened instrumented sockets. Use 0 to
  disable, -1 for automated sizing.
+ --performance-schema-max-sql-text-length=# 
+ Maximum length of displayed sql text.
  --performance-schema-max-stage-classes=# 
  Maximum number of stage instruments.
  --performance-schema-max-statement-classes=# 
  Maximum number of statement instruments.
+ --performance-schema-max-statement-stack=# 
+ Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
  --performance-schema-max-table-handles=# 
  Maximum number of opened instrumented tables. Use 0 to
  disable, -1 for automated sizing.
  --performance-schema-max-table-instances=# 
  Maximum number of instrumented tables. Use 0 to disable,
  -1 for automated sizing.
+ --performance-schema-max-table-lock-stat=# 
+ Maximum number of lock statistics for instrumented
+ tables. Use 0 to disable, -1 for automated scaling.
  --performance-schema-max-thread-classes=# 
  Maximum number of thread instruments.
  --performance-schema-max-thread-instances=# 
@@ -1613,9 +1648,12 @@ performance-schema-accounts-size -1
 performance-schema-consumer-events-stages-current FALSE
 performance-schema-consumer-events-stages-history FALSE
 performance-schema-consumer-events-stages-history-long FALSE
-performance-schema-consumer-events-statements-current TRUE
+performance-schema-consumer-events-statements-current FALSE
 performance-schema-consumer-events-statements-history FALSE
 performance-schema-consumer-events-statements-history-long FALSE
+performance-schema-consumer-events-transactions-current FALSE
+performance-schema-consumer-events-transactions-history FALSE
+performance-schema-consumer-events-transactions-history-long FALSE
 performance-schema-consumer-events-waits-current FALSE
 performance-schema-consumer-events-waits-history FALSE
 performance-schema-consumer-events-waits-history-long FALSE
@@ -1627,6 +1665,8 @@ performance-schema-events-stages-history-long-size -1
 performance-schema-events-stages-history-size -1
 performance-schema-events-statements-history-long-size -1
 performance-schema-events-statements-history-size -1
+performance-schema-events-transactions-history-long-size -1
+performance-schema-events-transactions-history-size -1
 performance-schema-events-waits-history-long-size -1
 performance-schema-events-waits-history-size -1
 performance-schema-hosts-size -1
@@ -1634,24 +1674,32 @@ performance-schema-instrument
 performance-schema-max-cond-classes 90
 performance-schema-max-cond-instances -1
 performance-schema-max-digest-length 1024
-performance-schema-max-file-classes 50
+performance-schema-max-file-classes 80
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances -1
-performance-schema-max-mutex-classes 200
+performance-schema-max-index-stat -1
+performance-schema-max-memory-classes 320
+performance-schema-max-metadata-locks -1
+performance-schema-max-mutex-classes 210
 performance-schema-max-mutex-instances -1
-performance-schema-max-rwlock-classes 40
+performance-schema-max-prepared-statements-instances -1
+performance-schema-max-program-instances -1
+performance-schema-max-rwlock-classes 50
 performance-schema-max-rwlock-instances -1
 performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
+performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 160
-performance-schema-max-statement-classes 202
+performance-schema-max-statement-classes 222
+performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1
+performance-schema-max-table-lock-stat -1
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances -1
 performance-schema-session-connect-attrs-size -1
-performance-schema-setup-actors-size 100
-performance-schema-setup-objects-size 100
+performance-schema-setup-actors-size -1
+performance-schema-setup-objects-size -1
 performance-schema-users-size -1
 port 3306
 port-open-timeout 0

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

@@ -45,7 +45,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	Init	SHOW processlist	TIME_MS
+ID	root	HOST_NAME	information_schema	Query	TIME	starting	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	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
@@ -125,7 +125,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM processlist  ORDER BY id	TID
@@ -190,7 +190,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -206,7 +206,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -233,7 +233,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	Init	SHOW processlist	TIME_MS
+ID		HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID		HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -259,7 +259,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -303,7 +303,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -331,7 +331,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -390,7 +390,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -421,7 +421,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -452,7 +452,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -490,7 +490,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID

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

@@ -45,7 +45,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	Init	SHOW processlist	TIME_MS
+ID	root	HOST_NAME	information_schema	Query	TIME	starting	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	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
@@ -125,7 +125,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM processlist  ORDER BY id	TID
@@ -190,7 +190,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -206,7 +206,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -233,7 +233,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	Init	SHOW processlist	TIME_MS
+ID		HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID		HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -259,7 +259,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -303,7 +303,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -331,7 +331,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -390,7 +390,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -421,7 +421,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -452,7 +452,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -490,7 +490,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	Init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	starting	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID

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

@@ -39,7 +39,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	Init	SHOW FULL PROCESSLIST	<TIME_MS>
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	starting	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;
@@ -85,7 +85,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	starting	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';
@@ -117,7 +117,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	starting	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	MEMORY_
 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>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	starting	SHOW FULL PROCESSLIST	0.000
 connection default;
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID <> @test_user_con1_id
@@ -156,7 +156,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	starting	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/funcs_1/r/processlist_val_ps.result

@@ -39,7 +39,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	test	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	Init	SHOW FULL PROCESSLIST	<TIME_MS>
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	starting	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;
@@ -85,7 +85,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	starting	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';
@@ -117,7 +117,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	starting	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	MEMORY_
 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>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	starting	SHOW FULL PROCESSLIST	0.000
 connection default;
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID <> @test_user_con1_id
@@ -156,7 +156,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	starting	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/multi_source/info_logs.result

@@ -90,16 +90,16 @@ MASTER 2.2
 #
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
-MASTER 2.2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
+MASTER 2.2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 include/wait_for_slave_to_start.inc
 set default_master_connection = 'MASTER 2.2';
 include/wait_for_slave_to_start.inc
 set default_master_connection = '';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	6	0	60.000	
-MASTER 2.2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	6	0	60.000	
+	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	6	0	60.000	
+MASTER 2.2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	6	0	60.000	
 #
 # List of files matching '*info*' pattern
 #   after slave server restart

mysql-test/suite/multi_source/multi_source_slave_alias_replica.result

@@ -21,7 +21,7 @@ connection slave;
 "Command: SHOW ALL STAVES STATUS --> SHOW ALL REPLICAS STATUS"
 SHOW ALL REPLICAS STATUS;
 Connection_name	slave1
-Slave_SQL_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_State	Slave has read all relay log; waiting for more updates
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
@@ -71,7 +71,7 @@ Replicate_Ignore_Domain_Ids
 Parallel_Mode	optimistic
 SQL_Delay	0
 SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_Running_State	Slave has read all relay log; waiting for more updates
 Slave_DDL_Groups	0
 Slave_Non_Transactional_Groups	0
 Slave_Transactional_Groups	0
@@ -82,7 +82,7 @@ Slave_received_heartbeats	0
 Slave_heartbeat_period	60.000
 Gtid_Slave_Pos	
 Connection_name	slave2
-Slave_SQL_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_State	Slave has read all relay log; waiting for more updates
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
@@ -132,7 +132,7 @@ Replicate_Ignore_Domain_Ids
 Parallel_Mode	optimistic
 SQL_Delay	0
 SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_Running_State	Slave has read all relay log; waiting for more updates
 Slave_DDL_Groups	0
 Slave_Non_Transactional_Groups	0
 Slave_Transactional_Groups	0

mysql-test/suite/multi_source/simple.result

@@ -19,8 +19,8 @@ connection master2;
 connection slave;
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-slave1	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave1.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave1	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave1.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 start all slaves;
 stop slave 'slave1';
 show slave 'slave1' status;
@@ -81,11 +81,11 @@ reset slave 'slave1';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
 slave1			127.0.0.1	root	MYPORT_1	60		4		<relay_log_pos>		No	No							0		0	0	<relay_log_space1>	None		0	No						NULL	No	0		0			1			No				optimistic	0	NULL		0	0	0	0	1073741824	7	0	60.000	
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 reset slave 'slave1' all;
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 stop all slaves;
 Warnings:
 Note	1938	SLAVE 'slave2' stopped

mysql-test/suite/perfschema/disabled.def

@@ -24,3 +24,34 @@ binlog_ok_row: needs slave_relay_log_info
 binlog_ok_stmt: needs slave_relay_log_info
 
 server_init : Nirbhay TODO: Fix the test
+show_sanity:
+threads_mysql_freebsd:
+
+transaction_gtid: needs to be updated for MariaDB gtids
+
+ddl_replication_applier_status_by_worker: todo
+ddl_replication_connection_status: todo
+dml_replication_applier_status_by_worker: todo
+dml_replication_connection_status: todo
+
+dml_replication_group_member_stats: todo?
+ddl_replication_group_member_stats: todo?
+ddl_replication_group_members: todo?
+dml_replication_group_members: todo?
+replication_group_members: todo?
+replication_group_member_stats: todo?
+rpl_group_member_stats: todo?
+rpl_group_members: todo?
+
+ddl_session_variables: todo
+ddl_global_variables: todo
+ddl_variables_by_thread: todo
+dml_global_variables: todo
+dml_session_variables: todo
+dml_variables_by_thread: todo
+variables_by_thread: todo
+show_coverage: todo
+show_misc: todo
+show_plugin: todo
+
+status_reprepare:why P_S filters out Com_* variables?

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

@@ -54,6 +54,7 @@
 --source include/have_perfschema.inc
 --source include/no_protocol.inc
 --source ../include/wait_for_pfs_thread_count.inc
+--source include/not_windows.inc
 
 --disable_query_log
 

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

@@ -3,6 +3,7 @@
 #
 
 --source include/no_protocol.inc
+--source include/have_innodb.inc
 
 --echo # SET-UP
 CREATE DATABASE nested_sp;
@@ -16,7 +17,7 @@ CREATE TABLE t1(
 CREATE TABLE t2(
   n INT UNSIGNED NOT NULL, 
   f BIGINT UNSIGNED
-);
+) engine=innodb;
 
 --echo ############################
 --echo # Creating Stored Programs #

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

@@ -3,6 +3,7 @@
 #
 
 --source include/no_protocol.inc
+--source include/have_innodb.inc
 
 --echo # SET-UP 
 
@@ -12,12 +13,12 @@ USE stored_programs;
 CREATE TABLE t1(
    i INT NOT NULL,
    j INT
-);
+) engine=innodb;
 
 CREATE TABLE t2(
    name   CHAR(16) NOT NULL DEFAULT '',
    id INT NOT NULL
-);
+) engine=innodb;
 
 CREATE TABLE t3(
    d DATE,

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

---disable_warnings
-
---echo
-SHOW GLOBAL STATUS LIKE "example_%";
---echo
-SHOW SESSION STATUS LIKE "example_%";
---echo
-SHOW GLOBAL VARIABLES LIKE "example_%";
---echo
-SHOW SESSION VARIABLES LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-
-#
-# Force sync of local and global system variables.
-#
---disable_result_log
---disable_query_log
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread WHERE variable_name LIKE "example_%";
---enable_query_log
---enable_result_log
-
---enable_warnings

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

@@ -87,20 +87,20 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
+#select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
+#select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
+#select * from performance_schema.global_variables;
+#select * from performance_schema.variables_by_thread;
+#select * from performance_schema.session_variables;
 --enable_result_log
 
 # This has a stable output, printing the result:

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

@@ -14,8 +14,7 @@ eval select event_name,
   order by thread_id, event_id;
 
 # In case of failures, this will tell if table io are lost.
-show status where Variable_name like 'performance_schema_%' and
-                  Variable_name not like 'performance_schema_%_classes_lost';
+show global status like 'performance_schema_%';
 
 # Cleanup
 truncate performance_schema.events_waits_history_long;

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

@@ -29,15 +29,14 @@ if(!$success)
 --echo # Verify
 --echo #========================================================================
 
-SELECT event_id from performance_schema.events_transactions_history_long
+SELECT event_id into @base_tx_event_id
+  from performance_schema.events_transactions_history_long
   where (THREAD_ID = @con1_thread_id)
-  order by event_id limit 1
-  into @base_tx_event_id;
+  order by event_id limit 1;
 
-SELECT event_id from performance_schema.events_statements_history_long
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
   where (THREAD_ID = @con1_thread_id)
-  order by event_id limit 1
-  into @base_stmt_event_id;
+  order by event_id limit 1;
 
 select if(@base_tx_event_id < @base_stmt_event_id,
           @base_tx_event_id - 1,

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

@@ -13,5 +13,3 @@
 --remove_file $MYSQLTEST_VARDIR/tmp/out_file
 --remove_file $MYSQLTEST_VARDIR/tmp/err_file
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
-
---source include/mysql_upgrade_cleanup.inc
\ No newline at end of file

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

+connect  con1, localhost, root, , ;
 drop table if exists t1;
 create table t1(a int) engine = myisam;
 insert into t1 values (1), (2), (3), (4), (5);
+connection default;
 update performance_schema.threads
 set instrumented = 'NO'
   where processlist_id = connection_id();
 truncate table performance_schema.events_statements_history_long;
 truncate table performance_schema.events_stages_history_long;
+connection con1;
 SET DEBUG_SYNC='RESET';
 SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_row EXECUTE 5';
 ALTER TABLE t1 engine = innodb;;
+connection default;
 SET DEBUG_SYNC='now WAIT_FOR found_row';
 select event_id from performance_schema.events_statements_current
 where thread_id = @con1_thread_id into @con1_stmt_id;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
 from performance_schema.events_stages_current
 where (thread_id = @con1_thread_id);
@@ -46,9 +52,11 @@ where (thread_id = @con1_thread_id);
 EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
 stage/sql/copy to tmp table	4	5
 SET DEBUG_SYNC='now SIGNAL wait_row';
+connection con1;
 select "After payload";
 After payload
 After payload
+connection default;
 Dumping ALTER TABLE stages
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
 from performance_schema.events_stages_history_long
@@ -58,22 +66,35 @@ order by thread_id, event_id;
 EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
 stage/sql/starting	NULL	NULL
 stage/sql/checking permissions	NULL	NULL
-stage/sql/checking permissions	NULL	NULL
-stage/sql/init	NULL	NULL
+stage/sql/init for update	NULL	NULL
 stage/sql/Opening tables	NULL	NULL
+stage/sql/After opening tables	NULL	NULL
 stage/sql/setup	NULL	NULL
 stage/sql/creating table	NULL	NULL
 stage/sql/After create	NULL	NULL
 stage/sql/System lock	NULL	NULL
+stage/sql/table lock	NULL	NULL
+stage/sql/After create	NULL	NULL
 stage/sql/copy to tmp table	5	5
-stage/sql/rename result table	NULL	NULL
-stage/sql/end	NULL	NULL
-stage/sql/query end	NULL	NULL
+stage/sql/Enabling keys	NULL	NULL
+stage/sql/Rename result table	NULL	NULL
+stage/sql/Unlocking tables	NULL	NULL
+stage/sql/Rename result table	NULL	NULL
+stage/sql/End of update loop	NULL	NULL
+stage/sql/Query end	NULL	NULL
+stage/sql/Commit	NULL	NULL
+stage/sql/closing tables	NULL	NULL
+stage/sql/Unlocking tables	NULL	NULL
 stage/sql/closing tables	NULL	NULL
-stage/sql/freeing items	NULL	NULL
-stage/sql/cleaning up	NULL	NULL
+stage/sql/Commit implicit	NULL	NULL
+stage/sql/Starting cleanup	NULL	NULL
+stage/sql/Freeing items	NULL	NULL
+stage/sql/Reset for next command	NULL	NULL
 SET DEBUG_SYNC='RESET';
+connection con1;
 drop table t1;
+disconnect con1;
+connection default;
 update performance_schema.threads
 set instrumented = 'YES'
   where processlist_id = connection_id();

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

+FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-enabled=maybe'/ in my_restart.err
 # Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
+FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-max_=12'/ in my_restart.err
 # Server start with ambigous startup option 'performance-schema-max_=12' : pass
+FOUND 1 /\[ERROR\].*unknown option '--performance-schema-unknown_99'/ in my_restart.err
 # Server start with invalid startup option '--performance-schema-unknown_99' : pass
+FOUND 1 /Can.t change dir to .*bad_option_h_param/ in my_restart.err
 # Server start with invalid startup option value '--datadir=bad_option_h_param' : pass

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

@@ -53,12 +53,15 @@ select 10*X.v + Y.v, 100*X.v + 10*Y.v + Z.v, 100*X.v + 10*Y.v + Z.v
 from t0 X, t0 Y, t0 Z;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 analyze table t2;
 Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
 test.t2	analyze	status	OK
 analyze table t3;
 Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	Engine-independent statistics collected
 test.t3	analyze	status	OK
 select * from t1 order by a;
 id1	a
@@ -111,14 +114,14 @@ id2	id3	c
 61	610	610
 61	611	611
 61	612	612
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	10	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	100	10.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	1000	10.00	Using where; Using join buffer (Block Nested Loop)
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	100.00	
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	100	100.00	Using where; Using join buffer (flat, BNL join)
+1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	1000	100.00	Using where; Using join buffer (incremental, BNL join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
+Note	1003	select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
 call before_payload();
 select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
@@ -126,10 +129,13 @@ call after_payload();
 number_seen	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OPERATION	NUMBER_OF_BYTES
 11	TABLE	test	t1	NULL	fetch	1
 1	TABLE	test	t1	NULL	read external	NULL
+1	TABLE	test	t1	NULL	read normal	NULL
 101	TABLE	test	t2	NULL	fetch	1
 1	TABLE	test	t2	NULL	read external	NULL
+1	TABLE	test	t2	NULL	read normal	NULL
 1	TABLE	test	t3	NULL	fetch	1000
 1	TABLE	test	t3	NULL	read external	NULL
+1	TABLE	test	t3	NULL	read normal	NULL
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
 TABLE	test	t0	NULL	0	0	0
 TABLE	test	t1	NULL	11	11	0
@@ -145,14 +151,14 @@ alter table t2 add unique index(id2);
 alter table t2 add index(id1);
 alter table t3 add unique index(id3);
 alter table t3 add index(id2);
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	id1	NULL	NULL	NULL	10	100.00	Using where
-1	SIMPLE	t2	NULL	ref	id2,id1	id1	5	test.t1.id1	10	100.00	Using where
-1	SIMPLE	t3	NULL	ref	id2	id2	5	test.t2.id2	10	100.00	NULL
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	id1	NULL	NULL	NULL	10	100.00	Using where
+1	SIMPLE	t2	ref	id2,id1	id1	5	test.t1.id1	10	100.00	Using where
+1	SIMPLE	t3	ref	id2	id2	5	test.t2.id2	10	100.00	
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
+Note	1003	select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
 call before_payload();
 select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
@@ -160,10 +166,13 @@ call after_payload();
 number_seen	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OPERATION	NUMBER_OF_BYTES
 11	TABLE	test	t1	NULL	fetch	1
 1	TABLE	test	t1	id1	read external	NULL
+1	TABLE	test	t1	id1	read normal	NULL
 110	TABLE	test	t2	id1	fetch	1
 1	TABLE	test	t2	id2	read external	NULL
+1	TABLE	test	t2	id2	read normal	NULL
 100	TABLE	test	t3	id2	fetch	10
 1	TABLE	test	t3	id3	read external	NULL
+1	TABLE	test	t3	id3	read normal	NULL
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
 TABLE	test	t0	NULL	0	0	0
 TABLE	test	t1	NULL	11	11	0

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

@@ -37,11 +37,8 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_connect_attrs;
 COUNT(DISTINCT PROCESSLIST_ID)
 2
-<<<<<<< HEAD
 connection non_privileged_user;
-=======
 # must return 1
->>>>>>> merge-perfschema-5.7
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_account_connect_attrs;
 COUNT(DISTINCT PROCESSLIST_ID)

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

@@ -11,7 +11,8 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set @old_dbug=@@global.debug_dbug;
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 TRUNCATE TABLE mysql.general_log;
 SET @old_log_output=          @@global.log_output;
 SET @old_general_log=         @@global.general_log;
@@ -19,6 +20,7 @@ SET @old_general_log_file=    @@global.general_log_file;
 SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
+connect con1, localhost, root,,;
 "Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -27,6 +29,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	localhost
 CONNECTION_TYPE	Socket
+disconnect con1;
+connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
 "Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -35,6 +39,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con2;
+connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
 "Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -43,6 +49,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	rootssl
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	SSL/TLS
+disconnect con3;
+connection default;
 SET GLOBAL general_log=       'OFF';
 CREATE TABLE test_log (argument TEXT);
 LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +75,7 @@ DROP TABLE test_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
-set global debug= default;
+set global debug_dbug= @old_dbug;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';

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

@@ -11,7 +11,7 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 TRUNCATE TABLE mysql.general_log;
 SET @old_log_output=          @@global.log_output;
 SET @old_general_log=         @@global.general_log;
@@ -19,6 +19,7 @@ SET @old_general_log_file=    @@global.general_log_file;
 SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
+connect con1, localhost, root,,;
 "Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -27,6 +28,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con1;
+connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
 "Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -35,6 +38,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con2;
+connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
 "Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -43,6 +48,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	rootssl
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	SSL/TLS
+disconnect con3;
+connection default;
 SET GLOBAL general_log=       'OFF';
 CREATE TABLE test_log (argument TEXT);
 LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +74,7 @@ DROP TABLE test_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
-set global debug= default;
+set global debug_dbug= default;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';

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

@@ -70,98 +70,51 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Variable_name	Value
 Performance_schema_accounts_lost	0
+Performance_schema_cond_classes_lost	0
 Performance_schema_cond_instances_lost	0
 Performance_schema_digest_lost	0
+Performance_schema_file_classes_lost	0
 Performance_schema_file_handles_lost	0
 Performance_schema_file_instances_lost	0
 Performance_schema_hosts_lost	0
 Performance_schema_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -170,17 +123,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_rwlock_instances_lost	0
 Performance_schema_session_connect_attrs_lost	0
+Performance_schema_socket_classes_lost	0
 Performance_schema_socket_instances_lost	0
+Performance_schema_stage_classes_lost	0
+Performance_schema_statement_classes_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_current ADD INDEX test_index(EVENT_
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_current(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history ADD INDEX test_index(EVENT_
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history_long ADD INDEX test_index(E
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history_long(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL

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

@@ -2,7 +2,7 @@ alter table performance_schema.global_variables
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.global_variables;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.global_variables
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

 alter table performance_schema.metadata_locks add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.metadata_locks;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.metadata_locks ADD INDEX test_index(TIMER_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.metadata_locks(TIMER_NAME);

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

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_configuration
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_configuration;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_configuration
 ADD INDEX test_index(desired_delay);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_status;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_status
 ADD INDEX test_index(remaining_delay);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status_by_coordinator
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_status_by_coordinator;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_status_by_coordinator
 ADD INDEX test_index(thread_id);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_connection_configuration
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_connection_configuration;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_connection_configuration
 ADD INDEX test_index(HOST);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ alter table performance_schema.session_status
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.session_status;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.session_status
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ alter table performance_schema.session_variables
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.session_variables;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.session_variables
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

 alter table performance_schema.table_handles add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.table_handles;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.table_handles ADD INDEX test_index(TIMER_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.table_handles(TIMER_NAME);

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

@@ -2,7 +2,7 @@ alter table performance_schema.user_variables_by_thread
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.user_variables_by_thread;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.user_variables_by_thread
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -2,7 +2,7 @@ alter table performance_schema.variables_by_thread
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.variables_by_thread;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.variables_by_thread
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

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

@@ -111,17 +111,10 @@ DROP TRIGGER trg;
 ####################################
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
-<<<<<<< HEAD
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	55	32	1	2
 statements_digest	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
-SHOW VARIABLES LIKE "performance_schema_digests_size";
-=======
-SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-NULL	NULL	NULL	55	32	1	2
-statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
 SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
->>>>>>> merge-perfschema-5.7
 Variable_name	Value
 performance_schema_digests_size	2
 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;

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

@@ -42,10 +42,7 @@ set host='ILLEGAL';
 ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_actors
 set role='ILLEGAL';
-<<<<<<< HEAD
 ERROR HY000: Invalid performance_schema usage
-=======
-ERROR HY000: Invalid performance_schema usage.
 update performance_schema.setup_actors
 set ENABLED='YES';
 update performance_schema.setup_actors
@@ -71,7 +68,6 @@ ERROR 01000: Data truncated for column 'HISTORY' at row 1
 update performance_schema.setup_actors
 set HISTORY=NULL;
 ERROR 23000: Column 'HISTORY' cannot be null
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_actors
 order by USER, HOST;
 HOST	USER	ROLE	ENABLED	HISTORY

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

@@ -4,35 +4,16 @@ where name like 'Wait/Synch/Mutex/sql/%'
   and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/mutex/sql/Ack_receiver::mutex	YES	YES
 wait/synch/mutex/sql/Cversion_lock	YES	YES
 wait/synch/mutex/sql/Delayed_insert::mutex	YES	YES
-=======
-wait/synch/mutex/sql/Commit_order_manager::m_mutex	YES	YES
-wait/synch/mutex/sql/Cost_constant_cache::LOCK_cost_const	YES	YES
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state	YES	YES
-<<<<<<< HEAD
 wait/synch/mutex/sql/gtid_waiting::LOCK_gtid_waiting	YES	YES
 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_after_binlog_sync	YES	YES
 wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/mutex/sql/LOCK_binlog_state	YES	YES
-=======
-wait/synch/mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex	YES	YES
-wait/synch/mutex/sql/Gtid_state	YES	YES
-wait/synch/mutex/sql/hash_filo::lock	YES	YES
-wait/synch/mutex/sql/key_mts_gaq_LOCK	YES	YES
-wait/synch/mutex/sql/key_mts_temp_table_LOCK	YES	YES
-wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
-wait/synch/mutex/sql/LOCK_compress_gtid_table	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Rwlock/sql/%'
   and name not in (
@@ -40,11 +21,7 @@ where name like 'Wait/Synch/Rwlock/sql/%'
 'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_all_status_vars	YES	YES
-=======
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
 wait/synch/rwlock/sql/LOCK_grant	YES	YES
 wait/synch/rwlock/sql/LOCK_SEQUENCE	YES	YES
@@ -54,24 +31,6 @@ wait/synch/rwlock/sql/LOCK_sys_init_connect	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_slave	YES	YES
 wait/synch/rwlock/sql/LOGGER::LOCK_logger	YES	YES
 wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/rwlock/sql/MDL_lock::rwlock	YES	YES
-wait/synch/rwlock/sql/Query_cache_query::lock	YES	YES
-wait/synch/rwlock/sql/THR_LOCK_servers	YES	YES
-=======
-wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock	YES	YES
-wait/synch/rwlock/sql/Binlog_storage_delegate::lock	YES	YES
-wait/synch/rwlock/sql/Binlog_transmit_delegate::lock	YES	YES
-wait/synch/rwlock/sql/channel_lock	YES	YES
-wait/synch/rwlock/sql/channel_map_lock	YES	YES
-wait/synch/rwlock/sql/gtid_commit_rollback	YES	YES
-wait/synch/rwlock/sql/gtid_mode_lock	YES	YES
-wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
-wait/synch/rwlock/sql/LOCK_grant	YES	YES
-wait/synch/rwlock/sql/LOCK_system_variables_hash	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Cond/sql/%'
   and name not in (
@@ -82,17 +41,8 @@ where name like 'Wait/Synch/Cond/sql/%'
 'wait/synch/cond/sql/COND_start_signal_handler')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/cond/sql/Ack_receiver::cond	YES	YES
 wait/synch/cond/sql/COND_binlog_send	YES	YES
-=======
-<<<<<<< HEAD
-=======
-wait/synch/cond/sql/Commit_order_manager::m_workers.cond	YES	YES
-wait/synch/cond/sql/COND_compress_gtid_table	YES	YES
-wait/synch/cond/sql/COND_connection_count	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/cond/sql/COND_flush_thread_cache	YES	YES
 wait/synch/cond/sql/COND_group_commit_orderer	YES	YES
 wait/synch/cond/sql/COND_gtid_ignore_duplicates	YES	YES
@@ -100,19 +50,7 @@ wait/synch/cond/sql/COND_manager	YES	YES
 wait/synch/cond/sql/COND_parallel_entry	YES	YES
 wait/synch/cond/sql/COND_prepare_ordered	YES	YES
 wait/synch/cond/sql/COND_queue_state	YES	YES
-<<<<<<< HEAD
 wait/synch/cond/sql/COND_rpl_thread	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/cond/sql/COND_rpl_thread_pool	YES	YES
-wait/synch/cond/sql/COND_rpl_thread_queue	YES	YES
-=======
-wait/synch/cond/sql/COND_server_started	YES	YES
-wait/synch/cond/sql/COND_thd_list	YES	YES
-wait/synch/cond/sql/COND_thread_cache	YES	YES
-wait/synch/cond/sql/COND_thr_lock	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name='Wait';
 select * from performance_schema.setup_instruments

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

 drop table if exists test.setup_objects;
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;

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

 update performance_schema.setup_timers
 set timer_name='CYCLE' where name="wait";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="stage";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="statement";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="transaction";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="idle";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MICROSECOND
@@ -26,19 +26,19 @@ stage	NANOSECOND
 statement	NANOSECOND
 transaction	MICROSECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers
 where name='Wait';
 NAME	TIMER_NAME
 wait	CYCLE
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers
 where timer_name='CYCLE';
 NAME	TIMER_NAME
 wait	CYCLE
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 insert into performance_schema.setup_timers
 set name='FOO', timer_name='CYCLE';
 ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
@@ -48,7 +48,7 @@ ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_timers
 set timer_name='MILLISECOND';
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MILLISECOND
@@ -57,11 +57,11 @@ stage	MILLISECOND
 statement	MILLISECOND
 transaction	MILLISECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='CYCLE';
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 delete from performance_schema.setup_timers;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
 delete from performance_schema.setup_timers
@@ -74,23 +74,23 @@ UNLOCK TABLES;
 update performance_schema.setup_timers
 set timer_name='CYCLE' where name="wait";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="stage";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="statement";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="transaction";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="idle";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MICROSECOND
@@ -99,4 +99,4 @@ stage	NANOSECOND
 statement	NANOSECOND
 transaction	MICROSECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release

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

 use performance_schema;
 update performance_schema.setup_instruments set enabled='YES';
-<<<<<<< HEAD
 create user pfsuser@localhost;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 flush privileges;
 connect  con1, localhost, pfsuser, , test;
 lock tables performance_schema.setup_instruments read;

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 3;
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create user 'quota'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;

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

@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_connections_per_hour 3;
-<<<<<<< HEAD
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_connections_per_hour 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_user_connections 3;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 connect  con3a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
 select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
 disconnect con3c;
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_user_connections 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 set global max_user_connections = 3;
 connect  con4a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;

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

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv4.example.com'
   identified by 'good_password';
 grant select on test.* to 'user_ssl'@'santa.claus.ipv4.example.com'
   REQUIRE SSL;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv4.example.com'
   REQUIRE SUBJECT '/C=??/ST=??/L=??/
     O=No such thing/
     CN=Santa Claus/emailAddress=santa.claus@example.com';
-<<<<<<< HEAD
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 3;
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;

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

@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_connections_per_hour 3;
-<<<<<<< HEAD
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_connections_per_hour 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_user_connections 3;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 connect  con3a,"::1",quota,,test,$MASTER_MYPORT,;
 select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
 disconnect con3c;
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_user_connections 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 set global max_user_connections = 3;
 connect  con4a,"::1",quota,,test,$MASTER_MYPORT,;

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

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv6.example.com'
   identified by 'good_password';
 grant select on test.* to 'user_ssl'@'santa.claus.ipv6.example.com'
   REQUIRE SSL;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv6.example.com'
   REQUIRE SUBJECT '/C=??/ST=??/L=??/
     O=No such thing/
     CN=Santa Claus/emailAddress=santa.claus@example.com';
-<<<<<<< HEAD
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive

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

 
 ## Connection default
 
+connection default;
 USE test;
 DROP TABLE IF EXISTS t1;
 SELECT @@global.binlog_cache_size;
@@ -15,6 +16,7 @@ wait/io/file/sql/io_cache	YES	YES
 
 ## Connection con1
 
+connect con1, localhost, root,,;
 USE test;
 CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
 SET SESSION AUTOCOMMIT = 0;
@@ -79,13 +81,16 @@ COMMIT;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 8
+disconnect con1;
 
 ## Connection default
 
+connection default;
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 8
 SELECT COUNT(*) FROM performance_schema.file_summary_by_event_name WHERE event_name LIKE "%io_cache%";
 COUNT(*)
 1
+connection default;
 DROP TABLE t1;

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

@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_history_size	10
 performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
+performance_schema_max_cond_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	1
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -172,7 +166,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################