5.7.13

include/mysql/psi/mysql_file.h

@@ -43,6 +43,10 @@
 
 #include "mysql/psi/psi.h"
 
+#ifndef PSI_FILE_CALL
+#define PSI_FILE_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup File_instrumentation File Instrumentation
   @ingroup Instrumentation_interface
@@ -290,7 +294,7 @@
 */
 #ifdef HAVE_PSI_FILE_INTERFACE
   #define mysql_file_create_temp(K, T, D, P, M, F) \
-    inline_mysql_file_create_temp(K, T, D, P, M, F)
+    inline_mysql_file_create_temp(K, __FILE__, __LINE__, T, D, P, M, F)
 #else
   #define mysql_file_create_temp(K, T, D, P, M, F) \
     inline_mysql_file_create_temp(T, D, P, M, F)
@@ -803,7 +807,8 @@ inline_mysql_file_fopen(
   const char *filename, int flags, myf myFlags)
 {
   MYSQL_FILE *that;
-  that= (MYSQL_FILE*) my_malloc(sizeof(MYSQL_FILE), MYF(MY_WME));
+  that= (MYSQL_FILE*) my_malloc(PSI_NOT_INSTRUMENTED,
+                                sizeof(MYSQL_FILE), MYF(MY_WME));
   if (likely(that != NULL))
   {
 #ifdef HAVE_PSI_FILE_INTERFACE
@@ -1011,20 +1016,27 @@ inline_mysql_file_create(
 static inline File
 inline_mysql_file_create_temp(
 #ifdef HAVE_PSI_FILE_INTERFACE
-  PSI_file_key key,
+  PSI_file_key key, const char *src_file, uint src_line,
 #endif
   char *to, const char *dir, const char *pfx, int mode, myf myFlags)
 {
   File file;
-  /*
-    TODO: This event is instrumented, but not timed.
-    The problem is that the file name is now known
-    before the create_temp_file call.
-  */
-  file= create_temp_file(to, dir, pfx, mode, myFlags);
 #ifdef HAVE_PSI_FILE_INTERFACE
-  PSI_FILE_CALL(create_file)(key, to, file);
+  struct PSI_file_locker *locker;
+  PSI_file_locker_state state;
+  locker= PSI_FILE_CALL(get_thread_file_name_locker)
+    (&state, key, PSI_FILE_CREATE, NULL, &locker);
+  if (likely(locker != NULL))
+  {
+    PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
+    /* The file name is generated by create_temp_file(). */
+    file= create_temp_file(to, dir, pfx, mode, myFlags);
+    PSI_FILE_CALL(end_temp_file_open_wait_and_bind_to_descriptor)(locker, file, (const char*)to);
+    return file;
+  }
 #endif
+
+  file= create_temp_file(to, dir, pfx, mode, myFlags);
   return file;
 }
 

include/mysql/psi/mysql_idle.h

-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #include "mysql/psi/psi.h"
 
+#ifndef PSI_IDLE_CALL
+#define PSI_IDLE_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup Idle_instrumentation Idle Instrumentation
   @ingroup Instrumentation_interface

include/mysql/psi/mysql_mdl.h

+/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef MYSQL_MDL_H
+#define MYSQL_MDL_H
+
+/**
+  @file mysql/psi/mysql_mdl.h
+  Instrumentation helpers for metadata locks.
+*/
+
+#include "mysql/psi/psi.h"
+
+#ifndef PSI_METADATA_CALL
+#define PSI_METADATA_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
+/**
+  @defgroup Thread_instrumentation Metadata Instrumentation
+  @ingroup Instrumentation_interface
+  @{
+*/
+
+/**
+  @def mysql_mdl_create(K, M, A)
+  Instrumented metadata lock creation.
+  @param I Metadata lock identity
+  @param K Metadata key
+  @param T Metadata lock type
+  @param D Metadata lock duration
+  @param S Metadata lock status
+  @param F request source file
+  @param L request source line
+*/
+
+#ifdef HAVE_PSI_METADATA_INTERFACE
+  #define mysql_mdl_create(I, K, T, D, S, F, L) \
+    inline_mysql_mdl_create(I, K, T, D, S, F, L)
+#else
+  #define mysql_mdl_create(I, K, T, D, S, F, L) NULL
+#endif
+
+#ifdef HAVE_PSI_METADATA_INTERFACE
+  #define mysql_mdl_set_status(L, S) \
+    inline_mysql_mdl_set_status(L, S)
+#else
+  #define mysql_mdl_set_status(L, S) \
+    do {} while (0)
+#endif
+
+
+/**
+  @def mysql_mdl_destroy(M)
+  Instrumented metadata lock destruction.
+  @param M Metadata lock
+*/
+#ifdef HAVE_PSI_METADATA_INTERFACE
+  #define mysql_mdl_destroy(M) \
+    inline_mysql_mdl_destroy(M, __FILE__, __LINE__)
+#else
+  #define mysql_mdl_destroy(M) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_METADATA_INTERFACE
+
+static inline PSI_metadata_lock *
+inline_mysql_mdl_create(void *identity,
+                        const MDL_key *mdl_key,
+                        enum_mdl_type mdl_type,
+                        enum_mdl_duration mdl_duration,
+                        MDL_ticket::enum_psi_status mdl_status,
+                        const char *src_file, uint src_line)
+{
+  PSI_metadata_lock *result;
+
+  /* static_cast: Fit a round C++ enum peg into a square C int hole ... */
+  result= PSI_METADATA_CALL(create_metadata_lock)
+    (identity,
+     mdl_key,
+     static_cast<opaque_mdl_type> (mdl_type),
+     static_cast<opaque_mdl_duration> (mdl_duration),
+     static_cast<opaque_mdl_status> (mdl_status),
+     src_file, src_line);
+
+  return result;
+}
+
+static inline void inline_mysql_mdl_set_status(
+  PSI_metadata_lock *psi,
+  MDL_ticket::enum_psi_status mdl_status)
+{
+  if (psi != NULL)
+    PSI_METADATA_CALL(set_metadata_lock_status)(psi, mdl_status);
+}
+
+static inline void inline_mysql_mdl_destroy(
+  PSI_metadata_lock *psi,
+  const char *src_file, uint src_line)
+{
+  if (psi != NULL)
+    PSI_METADATA_CALL(destroy_metadata_lock)(psi);
+}
+#endif /* HAVE_PSI_METADATA_INTERFACE */
+
+/** @} (end of group Metadata_instrumentation) */
+
+#endif
+

include/mysql/psi/mysql_memory.h

+/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef MYSQL_MEMORY_H
+#define MYSQL_MEMORY_H
+
+/**
+  @file mysql/psi/mysql_memory.h
+  Instrumentation helpers for memory allocation.
+*/
+
+#include "mysql/psi/psi.h"
+
+#ifndef PSI_MEMORY_CALL
+#define PSI_MEMORY_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
+/**
+  @defgroup Memory_instrumentation Memory Instrumentation
+  @ingroup Instrumentation_interface
+  @{
+*/
+
+/**
+  @def mysql_memory_register(P1, P2, P3)
+  Memory registration.
+*/
+#define mysql_memory_register(P1, P2, P3) \
+  inline_mysql_memory_register(P1, P2, P3)
+
+static inline void inline_mysql_memory_register(
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+  const char *category,
+  PSI_memory_info *info,
+  int count)
+#else
+  const char *category MY_ATTRIBUTE((unused)),
+  void *info MY_ATTRIBUTE((unused)),
+  int count MY_ATTRIBUTE((unused)))
+#endif
+{
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+  PSI_MEMORY_CALL(register_memory)(category, info, count);
+#endif
+}
+
+/** @} (end of group Memory_instrumentation) */
+
+#endif
+

include/mysql/psi/mysql_ps.h

+/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MYSQL_PS_H
+#define MYSQL_PS_H
+
+/**
+  @file mysql/psi/mysql_ps.h
+  Instrumentation helpers for prepared statements.
+*/
+
+#include "mysql/psi/psi.h"
+
+#ifndef PSI_PS_CALL
+#define PSI_PS_CALL(M) PSI_DYNAMIC_CALL(M)                               
+#endif    
+
+#ifdef HAVE_PSI_PS_INTERFACE
+  #define MYSQL_CREATE_PS(IDENTITY, ID, LOCKER, NAME, NAME_LENGTH, SQLTEXT, SQLTEXT_LENGTH) \
+    inline_mysql_create_prepared_stmt(IDENTITY, ID, LOCKER, NAME, NAME_LENGTH, SQLTEXT, SQLTEXT_LENGTH)
+  #define MYSQL_EXECUTE_PS(LOCKER, PREPARED_STMT) \
+    inline_mysql_execute_prepared_stmt(LOCKER, PREPARED_STMT)
+  #define MYSQL_DESTROY_PS(PREPARED_STMT) \
+    inline_mysql_destroy_prepared_stmt(PREPARED_STMT)
+  #define MYSQL_REPREPARE_PS(PREPARED_STMT) \
+    inline_mysql_reprepare_prepared_stmt(PREPARED_STMT)
+#else
+  #define MYSQL_CREATE_PS(IDENTITY, ID, LOCKER, NAME, NAME_LENGTH, SQLTEXT, SQLTEXT_LENGTH) \
+    NULL
+  #define MYSQL_EXECUTE_PS(LOCKER, PREPARED_STMT) \
+    do {} while (0)
+  #define MYSQL_DESTROY_PS(PREPARED_STMT) \
+    do {} while (0)
+  #define MYSQL_REPREPARE_PS(PREPARED_STMT) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_PS_INTERFACE
+static inline struct PSI_prepared_stmt*
+inline_mysql_create_prepared_stmt(void *identity, uint stmt_id,
+                                  PSI_statement_locker *locker,
+                                  const char *stmt_name, size_t stmt_name_length,
+                                  const char *sqltext, size_t sqltext_length)
+{
+  if (locker == NULL)
+    return NULL;
+  return PSI_PS_CALL(create_prepared_stmt)(identity, stmt_id, 
+                                           locker,
+                                           stmt_name, stmt_name_length,
+                                           sqltext, sqltext_length);
+}
+
+static inline void 
+inline_mysql_execute_prepared_stmt(PSI_statement_locker *locker,
+                                   PSI_prepared_stmt* prepared_stmt)
+{
+  if (prepared_stmt != NULL && locker != NULL)
+    PSI_PS_CALL(execute_prepared_stmt)(locker, prepared_stmt);
+}
+
+static inline void 
+inline_mysql_destroy_prepared_stmt(PSI_prepared_stmt *prepared_stmt)
+{
+  if (prepared_stmt != NULL)
+    PSI_PS_CALL(destroy_prepared_stmt)(prepared_stmt);
+}
+
+static inline void 
+inline_mysql_reprepare_prepared_stmt(PSI_prepared_stmt *prepared_stmt)
+{
+  if (prepared_stmt != NULL)
+    PSI_PS_CALL(reprepare_prepared_stmt)(prepared_stmt);
+}
+#endif
+
+#endif

include/mysql/psi/mysql_socket.h

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 /* For my_chsize */
 #include <my_sys.h>
 /* For socket api */
-#ifdef __WIN__
+#ifdef _WIN32
   #include <ws2def.h>
   #include <winsock2.h>
   #include <MSWSock.h>
@@ -42,6 +42,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 
 #include "mysql/psi/psi.h"
 
+#ifndef PSI_SOCKET_CALL
+#define PSI_SOCKET_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup Socket_instrumentation Socket Instrumentation
   @ingroup Instrumentation_interface
@@ -60,6 +64,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     do {} while (0)
 #endif
 
+/** An instrumented socket. */
 struct st_mysql_socket
 {
   /** The real socket descriptor. */
@@ -102,9 +107,8 @@ mysql_socket_invalid()
 /**
   Set socket descriptor and address.
   @param socket nstrumented socket
-  @param fd socket descriptor
   @param addr unformatted socket address
-  @param adr_len length of socket addres
+  @param addr_len length of socket addres
 */
 
 static inline void
@@ -129,7 +133,6 @@ mysql_socket_set_address(
 /**
   Set socket descriptor and address.
   @param socket instrumented socket
-  @param thread instrumented owning thread
 */
 static inline void
 mysql_socket_set_thread_owner(
@@ -196,7 +199,6 @@ mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd)
   @param STATE locker state
   @param SOCKET instrumented socket
   @param OP The socket operation to be performed
-  @param FLAGS per-socket operation flags.
   @param COUNT bytes to be written/read
   @sa MYSQL_END_SOCKET_WAIT.
 */
@@ -225,6 +227,13 @@ mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd)
     do {} while (0)
 #endif
 
+/**
+  @def MYSQL_SOCKET_SET_STATE
+  Set the state (IDLE, ACTIVE) of an instrumented socket.
+  @param SOCKET the instrumented socket
+  @param STATE the new state
+  @sa PSI_socket_state
+*/
 #ifdef HAVE_PSI_SOCKET_INTERFACE
   #define MYSQL_SOCKET_SET_STATE(SOCKET, STATE) \
     inline_mysql_socket_set_state(SOCKET, STATE)
@@ -320,8 +329,8 @@ inline_mysql_socket_set_state(MYSQL_SOCKET socket, enum PSI_socket_state state)
   Return port number and IP address of the local host
   @c mysql_socket_getsockname is a replacement for @c getsockname.
   @param FD Instrumented socket descriptor returned by socket()
-  @param A  Pointer to returned address of local host in sockaddr structure
-  @param L  Pointer to length of sockaddr structure
+  @param AP  Pointer to returned address of local host in @c sockaddr structure
+  @param LP  Pointer to length of @c sockaddr structure
 */
 #ifdef HAVE_PSI_SOCKET_INTERFACE
   #define mysql_socket_getsockname(FD, AP, LP) \
@@ -425,7 +434,7 @@ inline_mysql_socket_set_state(MYSQL_SOCKET socket, enum PSI_socket_state state)
   @param N  Maximum bytes to receive
   @param FL Control flags
   @param AP Pointer to source address in sockaddr_storage structure
-  @param L  Size of sockaddr_storage structure
+  @param LP Size of sockaddr_storage structure
 */
 #ifdef HAVE_PSI_SOCKET_INTERFACE
   #define mysql_socket_recvfrom(FD, B, N, FL, AP, LP) \
@@ -471,6 +480,19 @@ inline_mysql_socket_set_state(MYSQL_SOCKET socket, enum PSI_socket_state state)
     inline_mysql_socket_setsockopt(FD, LV, ON, OP, OL)
 #endif
 
+/**
+  @def mysql_sock_set_nonblocking
+  Set socket to non-blocking.
+  @param FD instrumented socket descriptor
+*/
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  #define mysql_sock_set_nonblocking(FD) \
+    inline_mysql_sock_set_nonblocking(__FILE__, __LINE__, FD)
+#else
+  #define mysql_sock_set_nonblocking(FD) \
+    inline_mysql_sock_set_nonblocking(FD)
+#endif
+
 /**
   @def mysql_socket_listen(FD, N)
   Set socket state to listen for an incoming connection.
@@ -965,6 +987,78 @@ inline_mysql_socket_setsockopt
   return result;
 }
 
+/** set_socket_nonblock */
+static inline int
+set_socket_nonblock(my_socket fd)
+{
+  int ret= 0;
+#ifdef _WIN32
+  {
+    u_long nonblocking= 1;
+    ret= ioctlsocket(fd, FIONBIO, &nonblocking);
+  }
+#else
+  {
+    int fd_flags;
+    fd_flags= fcntl(fd, F_GETFL, 0);
+    if (fd_flags < 0)
+      return errno;
+#if defined(O_NONBLOCK)
+    fd_flags |= O_NONBLOCK;
+#elif defined(O_NDELAY)
+    fd_flags |= O_NDELAY;
+#elif defined(O_FNDELAY)
+    fd_flags |= O_FNDELAY;
+#else
+#error "No definition of non-blocking flag found."
+#endif /* O_NONBLOCK */
+    if (fcntl(fd, F_SETFL, fd_flags) == -1)
+      ret= errno;
+  }
+#endif /* _WIN32 */
+  return ret;
+}
+
+/** mysql_socket_set_nonblocking */
+
+static inline int
+inline_mysql_sock_set_nonblocking
+(
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  const char *src_file, uint src_line,
+#endif
+  MYSQL_SOCKET mysql_socket
+)
+{
+  int result= 0;
+
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  if (mysql_socket.m_psi)
+  {
+    /* Instrumentation start */
+    PSI_socket_locker *locker;
+    PSI_socket_locker_state state;
+    locker= PSI_SOCKET_CALL(start_socket_wait)
+        (&state, mysql_socket.m_psi, PSI_SOCKET_OPT,
+         (size_t)0, src_file, src_line);
+
+    /* Instrumented code */
+    result= set_socket_nonblock(mysql_socket.fd);
+
+    /* Instrumentation end */
+    if (locker != NULL)
+      PSI_SOCKET_CALL(end_socket_wait)(locker, (size_t)0);
+
+    return result;
+  }
+#endif
+
+  /* Non instrumented code */
+  result= set_socket_nonblock(mysql_socket.fd);
+
+  return result;
+}
+
 /** mysql_socket_listen */
 
 static inline int
@@ -1104,7 +1198,7 @@ inline_mysql_socket_shutdown
 {
   int result;
 
-#ifdef __WIN__
+#ifdef _WIN32
   static LPFN_DISCONNECTEX DisconnectEx = NULL;
   if (DisconnectEx == NULL)
   {
@@ -1127,7 +1221,7 @@ inline_mysql_socket_shutdown
       (&state, mysql_socket.m_psi, PSI_SOCKET_SHUTDOWN, (size_t)0, src_file, src_line);
 
     /* Instrumented code */
-#ifdef __WIN__
+#ifdef _WIN32
     if (DisconnectEx)
       result= (DisconnectEx(mysql_socket.fd, (LPOVERLAPPED) NULL,
                             (DWORD) 0, (DWORD) 0) == TRUE) ? 0 : -1;
@@ -1144,7 +1238,7 @@ inline_mysql_socket_shutdown
 #endif
 
   /* Non instrumented code */
-#ifdef __WIN__
+#ifdef _WIN32
   if (DisconnectEx)
     result= (DisconnectEx(mysql_socket.fd, (LPOVERLAPPED) NULL,
                           (DWORD) 0, (DWORD) 0) == TRUE) ? 0 : -1;

include/mysql/psi/mysql_sp.h

+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MYSQL_SP_H
+#define MYSQL_SP_H
+
+/**
+  @file mysql/psi/mysql_sp.h
+  Instrumentation helpers for stored programs.
+*/
+
+#include "mysql/psi/psi.h"
+
+#ifndef PSI_SP_CALL
+#define PSI_SP_CALL(M) PSI_DYNAMIC_CALL(M)                               
+#endif    
+
+#ifdef HAVE_PSI_SP_INTERFACE
+  #define MYSQL_START_SP(STATE, SP_SHARE) \
+    inline_mysql_start_sp(STATE, SP_SHARE)
+#else
+  #define MYSQL_START_SP(STATE, SP_SHARE) \
+    NULL
+#endif
+
+
+#ifdef HAVE_PSI_SP_INTERFACE
+  #define MYSQL_END_SP(LOCKER) \
+    inline_mysql_end_sp(LOCKER)
+#else
+  #define MYSQL_END_SP(LOCKER) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_SP_INTERFACE
+  #define MYSQL_DROP_SP(OT, SN, SNL, ON, ONL) \
+    inline_mysql_drop_sp(OT, SN, SNL, ON, ONL)
+#else
+  #define MYSQL_DROP_SP(OT, SN, SNL, ON, ONL) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_SP_INTERFACE
+  #define MYSQL_GET_SP_SHARE(OT, SN, SNL, ON, ONL) \
+    inline_mysql_get_sp_share(OT, SN, SNL, ON, ONL)
+#else
+  #define MYSQL_GET_SP_SHARE(OT, SN, SNL, ON, ONL) \
+    NULL
+#endif
+
+#ifdef HAVE_PSI_SP_INTERFACE
+static inline struct PSI_sp_locker*
+inline_mysql_start_sp(PSI_sp_locker_state *state, PSI_sp_share *sp_share)
+{
+  return PSI_SP_CALL(start_sp)(state, sp_share);
+}
+
+static inline void inline_mysql_end_sp(PSI_sp_locker *locker)
+{
+  if (likely(locker != NULL))
+    PSI_SP_CALL(end_sp)(locker);
+}
+
+static inline void 
+inline_mysql_drop_sp(uint sp_type,
+                     const char* schema_name, uint shcema_name_length,
+                     const char* object_name, uint object_name_length)
+{
+  PSI_SP_CALL(drop_sp)(sp_type,
+                       schema_name, shcema_name_length,
+                       object_name, object_name_length);
+}
+
+static inline PSI_sp_share*
+inline_mysql_get_sp_share(uint sp_type,
+                          const char* schema_name, uint shcema_name_length,
+                          const char* object_name, uint object_name_length)
+{
+  return PSI_SP_CALL(get_sp_share)(sp_type,
+                                   schema_name, shcema_name_length,
+                                   object_name, object_name_length);
+}
+#endif
+
+#endif

include/mysql/psi/mysql_stage.h

-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #include "mysql/psi/psi.h"
 
+#ifndef PSI_STAGE_CALL
+#define PSI_STAGE_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup Stage_instrumentation Stage Instrumentation
   @ingroup Instrumentation_interface
@@ -41,12 +45,48 @@
   do {} while (0)
 #endif
 
+/**
+  @def MYSQL_SET_STAGE
+  Set the current stage.
+  Use this API when the file and line
+  is passed from the caller.
+  @param K the stage key
+  @param F the source file name
+  @param L the source file line
+  @return the current stage progress
+*/
 #ifdef HAVE_PSI_STAGE_INTERFACE
   #define MYSQL_SET_STAGE(K, F, L) \
     inline_mysql_set_stage(K, F, L)
 #else
   #define MYSQL_SET_STAGE(K, F, L) \
-    do {} while (0)
+    NULL
+#endif
+
+/**
+  @def mysql_set_stage
+  Set the current stage.
+  @param K the stage key
+  @return the current stage progress
+*/
+#ifdef HAVE_PSI_STAGE_INTERFACE
+  #define mysql_set_stage(K) \
+    inline_mysql_set_stage(K, __FILE__, __LINE__)
+#else
+  #define mysql_set_stage(K) \
+    NULL
+#endif
+
+/**
+  @def mysql_end_stage
+  End the last stage
+*/
+#ifdef HAVE_PSI_STAGE_INTERFACE
+  #define mysql_end_stage \
+    inline_mysql_end_stage
+#else
+  #define mysql_end_stage \
+  do {} while (0)
 #endif
 
 #ifdef HAVE_PSI_STAGE_INTERFACE
@@ -58,11 +98,97 @@ static inline void inline_mysql_stage_register(
 #endif
 
 #ifdef HAVE_PSI_STAGE_INTERFACE
-static inline void
+static inline PSI_stage_progress*
 inline_mysql_set_stage(PSI_stage_key key,
                        const char *src_file, int src_line)
 {
-  PSI_STAGE_CALL(start_stage)(key, src_file, src_line);
+  return PSI_STAGE_CALL(start_stage)(key, src_file, src_line);
+}
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+static inline void
+inline_mysql_end_stage()
+{
+  PSI_STAGE_CALL(end_stage)();
+}
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+#define mysql_stage_set_work_completed(P1, P2) \
+  inline_mysql_stage_set_work_completed(P1, P2)
+
+#define mysql_stage_get_work_completed(P1) \
+  inline_mysql_stage_get_work_completed(P1)
+#else
+#define mysql_stage_set_work_completed(P1, P2) \
+  do {} while (0)
+
+#define mysql_stage_get_work_completed(P1) \
+  do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+#define mysql_stage_inc_work_completed(P1, P2) \
+  inline_mysql_stage_inc_work_completed(P1, P2)
+#else
+#define mysql_stage_inc_work_completed(P1, P2) \
+  do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+#define mysql_stage_set_work_estimated(P1, P2) \
+  inline_mysql_stage_set_work_estimated(P1, P2)
+
+#define mysql_stage_get_work_estimated(P1) \
+  inline_mysql_stage_get_work_estimated(P1)
+#else
+#define mysql_stage_set_work_estimated(P1, P2) \
+  do {} while (0)
+
+#define mysql_stage_get_work_estimated(P1) \
+  do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+static inline void
+inline_mysql_stage_set_work_completed(PSI_stage_progress *progress,
+                                      ulonglong val)
+{
+  if (progress != NULL)
+    progress->m_work_completed= val;
+}
+
+static inline ulonglong
+inline_mysql_stage_get_work_completed(PSI_stage_progress *progress)
+{
+  return progress->m_work_completed;
+}
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+static inline void
+inline_mysql_stage_inc_work_completed(PSI_stage_progress *progress,
+                                      ulonglong val)
+{
+  if (progress != NULL)
+    progress->m_work_completed+= val;
+}
+#endif
+
+#ifdef HAVE_PSI_STAGE_INTERFACE
+static inline void
+inline_mysql_stage_set_work_estimated(PSI_stage_progress *progress,
+                                      ulonglong val)
+{
+  if (progress != NULL)
+    progress->m_work_estimated= val;
+}
+
+static inline ulonglong
+inline_mysql_stage_get_work_estimated(PSI_stage_progress *progress)
+{
+  return progress->m_work_estimated;
 }
 #endif
 

include/mysql/psi/mysql_statement.h

-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,6 +23,17 @@
 
 #include "mysql/psi/psi.h"
 
+class Diagnostics_area;
+typedef struct charset_info_st CHARSET_INFO;
+
+#ifndef PSI_STATEMENT_CALL
+#define PSI_STATEMENT_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
+#ifndef PSI_DIGEST_CALL
+#define PSI_DIGEST_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup Statement_instrumentation Statement Instrumentation
   @ingroup Instrumentation_interface
@@ -58,10 +69,10 @@
 #endif
 
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
-  #define MYSQL_START_STATEMENT(STATE, K, DB, DB_LEN, CS) \
-    inline_mysql_start_statement(STATE, K, DB, DB_LEN, CS, __FILE__, __LINE__)
+  #define MYSQL_START_STATEMENT(STATE, K, DB, DB_LEN, CS, SPS) \
+    inline_mysql_start_statement(STATE, K, DB, DB_LEN, CS, SPS, __FILE__, __LINE__)
 #else
-  #define MYSQL_START_STATEMENT(STATE, K, DB, DB_LEN, CS) \
+  #define MYSQL_START_STATEMENT(STATE, K, DB, DB_LEN, CS, SPS) \
     NULL
 #endif
 
@@ -146,10 +157,12 @@ inline_mysql_start_statement(PSI_statement_locker_state *state,
                              PSI_statement_key key,
                              const char *db, uint db_len,
                              const CHARSET_INFO *charset,
+                             PSI_sp_share *sp_share,
                              const char *src_file, int src_line)
 {
   PSI_statement_locker *locker;
-  locker= PSI_STATEMENT_CALL(get_thread_statement_locker)(state, key, charset);
+  locker= PSI_STATEMENT_CALL(get_thread_statement_locker)(state, key, charset,
+                                                          sp_share);
   if (likely(locker != NULL))
     PSI_STATEMENT_CALL(start_statement)(locker, db, db_len, src_file, src_line);
   return locker;

include/mysql/psi/mysql_table.h

-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,6 +23,10 @@
 
 #include "mysql/psi/psi.h"
 
+#ifndef PSI_TABLE_CALL
+#define PSI_TABLE_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
 /**
   @defgroup Table_instrumentation Table Instrumentation
   @ingroup Instrumentation_interface
@@ -49,72 +53,6 @@
   #define MYSQL_TABLE_WAIT_VARIABLES(LOCKER, STATE)
 #endif
 
-/**
-  @def MYSQL_TABLE_IO_WAIT
-  Instrumentation helper for table io_waits.
-  This instrumentation marks the start of a wait event.
-  @param PSI the instrumented table
-  @param OP the table operation to be performed
-  @param INDEX the table index used if any, or MAY_KEY.
-  @param FLAGS per table operation flags.
-  @sa MYSQL_END_TABLE_WAIT.
-*/
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_TABLE_IO_WAIT(PSI, OP, INDEX, FLAGS, PAYLOAD) \
-    {                                                         \
-      if (PSI != NULL)                                        \
-      {                                                       \
-        PSI_table_locker *locker;                             \
-        PSI_table_locker_state state;                         \
-        locker= PSI_TABLE_CALL(start_table_io_wait)           \
-          (& state, PSI, OP, INDEX, __FILE__, __LINE__);      \
-        PAYLOAD                                               \
-        if (locker != NULL)                                   \
-          PSI_TABLE_CALL(end_table_io_wait)(locker);          \
-      }                                                       \
-      else                                                    \
-      {                                                       \
-        PAYLOAD                                               \
-      }                                                       \
-    }
-#else
-  #define MYSQL_TABLE_IO_WAIT(PSI, OP, INDEX, FLAGS, PAYLOAD) \
-    PAYLOAD
-#endif
-
-/**
-  @def MYSQL_TABLE_LOCK_WAIT
-  Instrumentation helper for table io_waits.
-  This instrumentation marks the start of a wait event.
-  @param PSI the instrumented table
-  @param OP the table operation to be performed
-  @param INDEX the table index used if any, or MAY_KEY.
-  @param FLAGS per table operation flags.
-  @sa MYSQL_END_TABLE_WAIT.
-*/
-#ifdef HAVE_PSI_TABLE_INTERFACE
-  #define MYSQL_TABLE_LOCK_WAIT(PSI, OP, FLAGS, PAYLOAD) \
-    {                                                    \
-      if (PSI != NULL)                                   \
-      {                                                  \
-        PSI_table_locker *locker;                        \
-        PSI_table_locker_state state;                    \
-        locker= PSI_TABLE_CALL(start_table_lock_wait)    \
-          (& state, PSI, OP, FLAGS, __FILE__, __LINE__); \
-        PAYLOAD                                          \
-        if (locker != NULL)                              \
-          PSI_TABLE_CALL(end_table_lock_wait)(locker);   \
-      }                                                  \
-      else                                               \
-      {                                                  \
-        PAYLOAD                                          \
-      }                                                  \
-    }
-#else
-  #define MYSQL_TABLE_LOCK_WAIT(PSI, OP, FLAGS, PAYLOAD) \
-    PAYLOAD
-#endif
-
 /**
   @def MYSQL_START_TABLE_LOCK_WAIT
   Instrumentation helper for table lock waits.
@@ -150,6 +88,14 @@
     do {} while (0)
 #endif
 
+#ifdef HAVE_PSI_TABLE_INTERFACE
+  #define MYSQL_UNLOCK_TABLE(T) \
+    inline_mysql_unlock_table(T)
+#else
+  #define MYSQL_UNLOCK_TABLE(T) \
+    do {} while (0)
+#endif
+
 #ifdef HAVE_PSI_TABLE_INTERFACE
 /**
   Instrumentation calls for MYSQL_START_TABLE_LOCK_WAIT.
@@ -181,6 +127,13 @@ inline_mysql_end_table_lock_wait(struct PSI_table_locker *locker)
   if (locker != NULL)
     PSI_TABLE_CALL(end_table_lock_wait)(locker);
 }
+
+static inline void
+inline_mysql_unlock_table(struct PSI_table *table)
+{
+  if (table != NULL)
+    PSI_TABLE_CALL(unlock_table)(table);
+}
 #endif
 
 /** @} (end of group Table_instrumentation) */

include/mysql/psi/mysql_transaction.h

+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MYSQL_TRANSACTION_H
+#define MYSQL_TRANSACTION_H
+
+/**
+  @file mysql/psi/mysql_transaction.h
+  Instrumentation helpers for transactions.
+*/
+
+#include "mysql/psi/psi.h"
+
+#ifndef PSI_TRANSACTION_CALL
+#define PSI_TRANSACTION_CALL(M) PSI_DYNAMIC_CALL(M)
+#endif
+
+/**
+  @defgroup Transaction_instrumentation Transaction Instrumentation
+  @ingroup Instrumentation_interface
+  @{
+*/
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_START_TRANSACTION(STATE, XID, TRXID, ISO, RO, AC) \
+    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)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_SET_TRANSACTION_GTID(LOCKER, P1, P2) \
+    inline_mysql_set_transaction_gtid(LOCKER, P1, P2)
+#else
+  #define MYSQL_SET_TRANSACTION_GTID(LOCKER, P1, P2) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_SET_TRANSACTION_XID(LOCKER, P1, P2) \
+    inline_mysql_set_transaction_xid(LOCKER, P1, P2)
+#else
+  #define MYSQL_SET_TRANSACTION_XID(LOCKER, P1, P2) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_SET_TRANSACTION_XA_STATE(LOCKER, P1) \
+    inline_mysql_set_transaction_xa_state(LOCKER, P1)
+#else
+  #define MYSQL_SET_TRANSACTION_XA_STATE(LOCKER, P1) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_SET_TRANSACTION_TRXID(LOCKER, P1) \
+    inline_mysql_set_transaction_trxid(LOCKER, P1)
+#else
+  #define MYSQL_SET_TRANSACTION_TRXID(LOCKER, P1) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_INC_TRANSACTION_SAVEPOINTS(LOCKER, P1) \
+    inline_mysql_inc_transaction_savepoints(LOCKER, P1)
+#else
+  #define MYSQL_INC_TRANSACTION_SAVEPOINTS(LOCKER, P1) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_INC_TRANSACTION_ROLLBACK_TO_SAVEPOINT(LOCKER, P1) \
+    inline_mysql_inc_transaction_rollback_to_savepoint(LOCKER, P1)
+#else
+  #define MYSQL_INC_TRANSACTION_ROLLBACK_TO_SAVEPOINT(LOCKER, P1) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_INC_TRANSACTION_RELEASE_SAVEPOINT(LOCKER, P1) \
+    inline_mysql_inc_transaction_release_savepoint(LOCKER, P1)
+#else
+  #define MYSQL_INC_TRANSACTION_RELEASE_SAVEPOINT(LOCKER, P1) \
+    do {} while (0)
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_ROLLBACK_TRANSACTION(LOCKER) \
+    inline_mysql_rollback_transaction(LOCKER)
+#else
+  #define MYSQL_ROLLBACK_TRANSACTION(LOCKER) \
+    NULL
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+  #define MYSQL_COMMIT_TRANSACTION(LOCKER) \
+    inline_mysql_commit_transaction(LOCKER)
+#else
+  #define MYSQL_COMMIT_TRANSACTION(LOCKER) \
+    NULL
+#endif
+
+#ifdef HAVE_PSI_TRANSACTION_INTERFACE
+static inline struct PSI_transaction_locker *
+inline_mysql_start_transaction(PSI_transaction_locker_state *state,
+                               const void *xid,
+                               const ulonglong *trxid,
+                               int isolation_level,
+                               my_bool read_only,
+                               my_bool autocommit,
+                               const char *src_file, int src_line)
+{
+  PSI_transaction_locker *locker;
+  locker= PSI_TRANSACTION_CALL(get_thread_transaction_locker)(state,
+                                                              xid, trxid,
+                                                              isolation_level,
+                                                              read_only,
+                                                              autocommit);
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(start_transaction)(locker, src_file, src_line);
+  return locker;
+}
+
+static inline void
+inline_mysql_set_transaction_gtid(PSI_transaction_locker *locker,
+                                  const void *sid,
+                                  const void *gtid_spec)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(set_transaction_gtid)(locker, sid, gtid_spec);
+}
+
+static inline void
+inline_mysql_set_transaction_xid(PSI_transaction_locker *locker,
+                                 const void *xid,
+                                 int xa_state)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(set_transaction_xid)(locker, xid, xa_state);
+}
+
+static inline void
+inline_mysql_set_transaction_xa_state(PSI_transaction_locker *locker,
+                                      int xa_state)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(set_transaction_xa_state)(locker, xa_state);
+}
+
+static inline void
+inline_mysql_set_transaction_trxid(PSI_transaction_locker *locker,
+                                   const ulonglong *trxid)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(set_transaction_trxid)(locker, trxid);
+}
+
+static inline void
+inline_mysql_inc_transaction_savepoints(PSI_transaction_locker *locker,
+                                        ulong count)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(inc_transaction_savepoints)(locker, count);
+}
+
+static inline void
+inline_mysql_inc_transaction_rollback_to_savepoint(PSI_transaction_locker *locker,
+                                                   ulong count)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(inc_transaction_rollback_to_savepoint)(locker, count);
+}
+
+static inline void
+inline_mysql_inc_transaction_release_savepoint(PSI_transaction_locker *locker,
+                                               ulong count)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(inc_transaction_release_savepoint)(locker, count);
+}
+
+static inline void
+inline_mysql_rollback_transaction(struct PSI_transaction_locker *locker)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(end_transaction)(locker, false);
+}
+
+static inline void
+inline_mysql_commit_transaction(struct PSI_transaction_locker *locker)
+{
+  if (likely(locker != NULL))
+    PSI_TRANSACTION_CALL(end_transaction)(locker, true);
+}
+#endif
+
+/** @} (end of group Transaction_instrumentation) */
+
+#endif
+

include/mysql/psi/psi_abi_v0.h

-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,6 @@
   This file is only used to automate detection of changes between versions.
   Do not include this file, include mysql/psi/psi.h instead.
 */
-#define _global_h
+#define MY_GLOBAL_INCLUDED
 #include "mysql/psi/psi.h"
 

include/mysql/psi/psi_abi_v0.h.pp

 #include "mysql/psi/psi.h"
+#include "psi_base.h"
+#include "psi_memory.h"
+#include "psi_base.h"
+struct PSI_thread;
+typedef unsigned int PSI_memory_key;
 C_MODE_START
+struct MDL_key;
+typedef struct MDL_key MDL_key;
+typedef int opaque_mdl_type;
+typedef int opaque_mdl_duration;
+typedef int opaque_mdl_status;
+typedef int opaque_vio_type;
 struct TABLE_SHARE;
 struct sql_digest_storage;
+  struct opaque_THD
+  {
+    int dummy;
+  };
+  typedef struct opaque_THD THD;
 struct PSI_mutex;
 typedef struct PSI_mutex PSI_mutex;
 struct PSI_rwlock;
@@ -18,14 +34,51 @@ struct PSI_file;
 typedef struct PSI_file PSI_file;
 struct PSI_socket;
 typedef struct PSI_socket PSI_socket;
+struct PSI_prepared_stmt;
+typedef struct PSI_prepared_stmt PSI_prepared_stmt;
 struct PSI_table_locker;
 typedef struct PSI_table_locker PSI_table_locker;
 struct PSI_statement_locker;
 typedef struct PSI_statement_locker PSI_statement_locker;
+struct PSI_transaction_locker;
+typedef struct PSI_transaction_locker PSI_transaction_locker;
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
 struct PSI_digest_locker;
 typedef struct PSI_digest_locker PSI_digest_locker;
+struct PSI_sp_share;
+typedef struct PSI_sp_share PSI_sp_share;
+struct PSI_sp_locker;
+typedef struct PSI_sp_locker PSI_sp_locker;
+struct PSI_metadata_lock;
+typedef struct PSI_metadata_lock PSI_metadata_lock;
+struct PSI_stage_progress
+{
+  ulonglong m_work_completed;
+  ulonglong m_work_estimated;
+};
+typedef struct PSI_stage_progress PSI_stage_progress;
+enum PSI_table_io_operation
+{
+  PSI_TABLE_FETCH_ROW= 0,
+  PSI_TABLE_WRITE_ROW= 1,
+  PSI_TABLE_UPDATE_ROW= 2,
+  PSI_TABLE_DELETE_ROW= 3
+};
+typedef enum PSI_table_io_operation PSI_table_io_operation;
+struct PSI_table_locker_state
+{
+  uint m_flags;
+  enum PSI_table_io_operation m_io_operation;
+  struct PSI_table *m_table;
+  struct PSI_table_share *m_table_share;
+  struct PSI_thread *m_thread;
+  ulonglong m_timer_start;
+  ulonglong (*m_timer)(void);
+  void *m_wait;
+  uint m_index;
+};
+typedef struct PSI_table_locker_state PSI_table_locker_state;
 struct PSI_bootstrap
 {
   void* (*get_interface)(int version);

include/mysql/psi/psi_abi_v2.h

-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,6 @@
 */
 #define USE_PSI_2
 #define HAVE_PSI_INTERFACE
-#define _global_h
+#define MY_GLOBAL_INCLUDED
 #include "mysql/psi/psi.h"
 

include/mysql/psi/psi_abi_v2.h.pp

 #include "mysql/psi/psi.h"
+#include "psi_base.h"
+#include "psi_memory.h"
+#include "psi_base.h"
+struct PSI_thread;
+typedef unsigned int PSI_memory_key;
+struct PSI_memory_info_v2
+{
+  int placeholder;
+};
+typedef struct PSI_memory_info_v2 PSI_memory_info;
 C_MODE_START
+struct MDL_key;
+typedef struct MDL_key MDL_key;
+typedef int opaque_mdl_type;
+typedef int opaque_mdl_duration;
+typedef int opaque_mdl_status;
+typedef int opaque_vio_type;
 struct TABLE_SHARE;
 struct sql_digest_storage;
+  struct opaque_THD
+  {
+    int dummy;
+  };
+  typedef struct opaque_THD THD;
 struct PSI_mutex;
 typedef struct PSI_mutex PSI_mutex;
 struct PSI_rwlock;
@@ -18,14 +39,51 @@ struct PSI_file;
 typedef struct PSI_file PSI_file;
 struct PSI_socket;
 typedef struct PSI_socket PSI_socket;
+struct PSI_prepared_stmt;
+typedef struct PSI_prepared_stmt PSI_prepared_stmt;
 struct PSI_table_locker;
 typedef struct PSI_table_locker PSI_table_locker;
 struct PSI_statement_locker;
 typedef struct PSI_statement_locker PSI_statement_locker;
+struct PSI_transaction_locker;
+typedef struct PSI_transaction_locker PSI_transaction_locker;
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
 struct PSI_digest_locker;
 typedef struct PSI_digest_locker PSI_digest_locker;
+struct PSI_sp_share;
+typedef struct PSI_sp_share PSI_sp_share;
+struct PSI_sp_locker;
+typedef struct PSI_sp_locker PSI_sp_locker;
+struct PSI_metadata_lock;
+typedef struct PSI_metadata_lock PSI_metadata_lock;
+struct PSI_stage_progress
+{
+  ulonglong m_work_completed;
+  ulonglong m_work_estimated;
+};
+typedef struct PSI_stage_progress PSI_stage_progress;
+enum PSI_table_io_operation
+{
+  PSI_TABLE_FETCH_ROW= 0,
+  PSI_TABLE_WRITE_ROW= 1,
+  PSI_TABLE_UPDATE_ROW= 2,
+  PSI_TABLE_DELETE_ROW= 3
+};
+typedef enum PSI_table_io_operation PSI_table_io_operation;
+struct PSI_table_locker_state
+{
+  uint m_flags;
+  enum PSI_table_io_operation m_io_operation;
+  struct PSI_table *m_table;
+  struct PSI_table_share *m_table_share;
+  struct PSI_thread *m_thread;
+  ulonglong m_timer_start;
+  ulonglong (*m_timer)(void);
+  void *m_wait;
+  uint m_index;
+};
+typedef struct PSI_table_locker_state PSI_table_locker_state;
 struct PSI_bootstrap
 {
   void* (*get_interface)(int version);
@@ -41,6 +99,8 @@ struct PSI_file_locker;
 typedef struct PSI_file_locker PSI_file_locker;
 struct PSI_socket_locker;
 typedef struct PSI_socket_locker PSI_socket_locker;
+struct PSI_metadata_locker;
+typedef struct PSI_metadata_locker PSI_metadata_locker;
 enum PSI_mutex_operation
 {
   PSI_MUTEX_LOCK= 0,
@@ -52,7 +112,13 @@ enum PSI_rwlock_operation
   PSI_RWLOCK_READLOCK= 0,
   PSI_RWLOCK_WRITELOCK= 1,
   PSI_RWLOCK_TRYREADLOCK= 2,
-  PSI_RWLOCK_TRYWRITELOCK= 3
+  PSI_RWLOCK_TRYWRITELOCK= 3,
+  PSI_RWLOCK_SHAREDLOCK= 4,
+  PSI_RWLOCK_SHAREDEXCLUSIVELOCK= 5,
+  PSI_RWLOCK_EXCLUSIVELOCK= 6,
+  PSI_RWLOCK_TRYSHAREDLOCK= 7,
+  PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK= 8,
+  PSI_RWLOCK_TRYEXCLUSIVELOCK= 9
 };
 typedef enum PSI_rwlock_operation PSI_rwlock_operation;
 enum PSI_cond_operation
@@ -82,14 +148,6 @@ enum PSI_file_operation
   PSI_FILE_SYNC= 16
 };
 typedef enum PSI_file_operation PSI_file_operation;
-enum PSI_table_io_operation
-{
-  PSI_TABLE_FETCH_ROW= 0,
-  PSI_TABLE_WRITE_ROW= 1,
-  PSI_TABLE_UPDATE_ROW= 2,
-  PSI_TABLE_DELETE_ROW= 3
-};
-typedef enum PSI_table_io_operation PSI_table_io_operation;
 enum PSI_table_lock_operation
 {
   PSI_TABLE_LOCK= 0,
@@ -161,6 +219,10 @@ struct PSI_statement_info_v2
 {
   int placeholder;
 };
+struct PSI_transaction_info_v2
+{
+  int placeholder;
+};
 struct PSI_idle_locker_state_v2
 {
   int placeholder;
@@ -181,11 +243,11 @@ struct PSI_file_locker_state_v2
 {
   int placeholder;
 };
-struct PSI_table_locker_state_v2
+struct PSI_statement_locker_state_v2
 {
   int placeholder;
 };
-struct PSI_statement_locker_state_v2
+struct PSI_transaction_locker_state_v2
 {
   int placeholder;
 };
@@ -193,6 +255,10 @@ struct PSI_socket_locker_state_v2
 {
   int placeholder;
 };
+struct PSI_metadata_locker_state_v2
+{
+  int placeholder;
+};
 typedef struct PSI_v2 PSI;
 typedef struct PSI_mutex_info_v2 PSI_mutex_info;
 typedef struct PSI_rwlock_info_v2 PSI_rwlock_info;
@@ -201,14 +267,17 @@ typedef struct PSI_thread_info_v2 PSI_thread_info;
 typedef struct PSI_file_info_v2 PSI_file_info;
 typedef struct PSI_stage_info_v2 PSI_stage_info;
 typedef struct PSI_statement_info_v2 PSI_statement_info;
+typedef struct PSI_transaction_info_v2 PSI_transaction_info;
 typedef struct PSI_socket_info_v2 PSI_socket_info;
 typedef struct PSI_idle_locker_state_v2 PSI_idle_locker_state;
 typedef struct PSI_mutex_locker_state_v2 PSI_mutex_locker_state;
 typedef struct PSI_rwlock_locker_state_v2 PSI_rwlock_locker_state;
 typedef struct PSI_cond_locker_state_v2 PSI_cond_locker_state;
 typedef struct PSI_file_locker_state_v2 PSI_file_locker_state;
-typedef struct PSI_table_locker_state_v2 PSI_table_locker_state;
 typedef struct PSI_statement_locker_state_v2 PSI_statement_locker_state;
+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 PSI *PSI_server;
 C_MODE_END

include/mysql/psi/psi_base.h

+/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef MYSQL_PSI_BASE_H
+#define MYSQL_PSI_BASE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  @file mysql/psi/psi_base.h
+  Performance schema instrumentation interface.
+
+  @defgroup Instrumentation_interface Instrumentation Interface
+  @ingroup Performance_schema
+  @{
+*/
+
+#define PSI_INSTRUMENT_ME 0
+
+#define PSI_NOT_INSTRUMENTED 0
+
+/**
+  Global flag.
+  This flag indicate that an instrumentation point is a global variable,
+  or a singleton.
+*/
+#define PSI_FLAG_GLOBAL (1 << 0)
+
+/**
+  Mutable flag.
+  This flag indicate that an instrumentation point is a general placeholder,
+  that can mutate into a more specific instrumentation point.
+*/
+#define PSI_FLAG_MUTABLE (1 << 1)
+
+#define PSI_FLAG_THREAD (1 << 2)
+
+/**
+  Stage progress flag.
+  This flag apply to the stage instruments only.
+  It indicates the instrumentation provides progress data.
+*/
+#define PSI_FLAG_STAGE_PROGRESS (1 << 3)
+
+/**
+  Shared Exclusive flag.
+  Indicates that rwlock support the shared exclusive state.
+*/
+#define PSI_RWLOCK_FLAG_SX (1 << 4)
+
+/**
+  Transferable flag.
+  This flag indicate that an instrumented object can
+  be created by a thread and destroyed by another thread.
+*/
+#define PSI_FLAG_TRANSFER (1 << 5)
+
+/**
+  Volatility flag.
+  This flag indicate that an instrumented object
+  has a volatility (life cycle) comparable
+  to the volatility of a session.
+*/
+#define PSI_FLAG_VOLATILITY_SESSION (1 << 6)
+
+#ifdef HAVE_PSI_INTERFACE
+
+/**
+  @def PSI_VERSION_1
+  Performance Schema Interface number for version 1.
+  This version is supported.
+*/
+#define PSI_VERSION_1 1
+
+/**
+  @def PSI_VERSION_2
+  Performance Schema Interface number for version 2.
+  This version is not implemented, it's a placeholder.
+*/
+#define PSI_VERSION_2 2
+
+/**
+  @def PSI_CURRENT_VERSION
+  Performance Schema Interface number for the most recent version.
+  The most current version is @c PSI_VERSION_1
+*/
+#define PSI_CURRENT_VERSION 1
+
+/**
+  @def USE_PSI_1
+  Define USE_PSI_1 to use the interface version 1.
+*/
+
+/**
+  @def USE_PSI_2
+  Define USE_PSI_2 to use the interface version 2.
+*/
+
+/**
+  @def HAVE_PSI_1
+  Define HAVE_PSI_1 if the interface version 1 needs to be compiled in.
+*/
+
+/**
+  @def HAVE_PSI_2
+  Define HAVE_PSI_2 if the interface version 2 needs to be compiled in.
+*/
+
+#ifndef USE_PSI_2
+#ifndef USE_PSI_1
+#define USE_PSI_1
+#endif
+#endif
+
+#ifdef USE_PSI_1
+#define HAVE_PSI_1
+#endif
+
+#ifdef USE_PSI_2
+#define HAVE_PSI_2
+#endif
+
+/*
+  Allow to override PSI_XXX_CALL at compile time
+  with more efficient implementations, if available.
+  If nothing better is available,
+  make a dynamic call using the PSI_server function pointer.
+*/
+
+#define PSI_DYNAMIC_CALL(M) PSI_server->M
+
+#endif /* HAVE_PSI_INTERFACE */
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MYSQL_PSI_BASE_H */
+

include/mysql/psi/psi_memory.h

+/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef MYSQL_PSI_MEMORY_H
+#define MYSQL_PSI_MEMORY_H
+
+#include "psi_base.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  @file mysql/psi/psi_memory.h
+  Performance schema instrumentation interface.
+
+  @defgroup Instrumentation_interface Instrumentation Interface
+  @ingroup Performance_schema
+  @{
+*/
+
+#ifdef HAVE_PSI_INTERFACE
+#ifndef DISABLE_ALL_PSI
+#ifndef DISABLE_PSI_MEMORY
+#define HAVE_PSI_MEMORY_INTERFACE
+#endif /* DISABLE_PSI_MEMORY */
+#endif /* DISABLE_ALL_PSI */
+#endif /* HAVE_PSI_INTERFACE */
+
+struct PSI_thread;
+
+/**
+  Instrumented memory key.
+  To instrument memory, a memory key must be obtained using @c register_memory.
+  Using a zero key always disable the instrumentation.
+*/
+typedef unsigned int PSI_memory_key;
+
+#ifdef HAVE_PSI_1
+
+/**
+  @defgroup Group_PSI_v1 Application Binary Interface, version 1
+  @ingroup Instrumentation_interface
+  @{
+*/
+
+/**
+  Memory instrument information.
+  @since PSI_VERSION_1
+  This structure is used to register instrumented memory.
+*/
+struct PSI_memory_info_v1
+{
+  /** Pointer to the key assigned to the registered memory. */
+  PSI_memory_key *m_key;
+  /** The name of the memory instrument to register. */
+  const char *m_name;
+  /**
+    The flags of the socket instrument to register.
+    @sa PSI_FLAG_GLOBAL
+  */
+  int m_flags;
+};
+typedef struct PSI_memory_info_v1 PSI_memory_info_v1;
+
+/**
+  Memory registration API.
+  @param category a category name (typically a plugin name)
+  @param info an array of memory info to register
+  @param count the size of the info array
+*/
+typedef void (*register_memory_v1_t)
+  (const char *category, struct PSI_memory_info_v1 *info, int count);
+
+/**
+  Instrument memory allocation.
+  @param key the memory instrument key
+  @param size the size of memory allocated
+  @param[out] owner the memory owner
+  @return the effective memory instrument key
+*/
+typedef PSI_memory_key (*memory_alloc_v1_t)
+  (PSI_memory_key key, size_t size, struct PSI_thread ** owner);
+
+/**
+  Instrument memory re allocation.
+  @param key the memory instrument key
+  @param old_size the size of memory previously allocated
+  @param new_size the size of memory re allocated
+  @param[in, out] owner the memory owner
+  @return the effective memory instrument key
+*/
+typedef PSI_memory_key (*memory_realloc_v1_t)
+  (PSI_memory_key key, size_t old_size, size_t new_size, struct PSI_thread ** owner);
+
+/**
+  Instrument memory claim.
+  @param key the memory instrument key
+  @param size the size of memory allocated
+  @param[in, out] owner the memory owner
+  @return the effective memory instrument key
+*/
+typedef PSI_memory_key (*memory_claim_v1_t)
+  (PSI_memory_key key, size_t size, struct PSI_thread ** owner);
+
+/**
+  Instrument memory free.
+  @param key the memory instrument key
+  @param size the size of memory allocated
+  @param owner the memory owner
+*/
+typedef void (*memory_free_v1_t)
+  (PSI_memory_key key, size_t size, struct PSI_thread * owner);
+
+/** @} (end of group Group_PSI_v1) */
+
+#endif /* HAVE_PSI_1 */
+
+#ifdef HAVE_PSI_2
+struct PSI_memory_info_v2
+{
+  int placeholder;
+};
+
+#endif /* HAVE_PSI_2 */
+
+#ifdef USE_PSI_1
+typedef struct PSI_memory_info_v1 PSI_memory_info;
+#endif
+
+#ifdef USE_PSI_2
+typedef struct PSI_memory_info_v2 PSI_memory_info;
+#endif
+
+/** @} (end of group Instrumentation_interface) */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* MYSQL_PSI_MEMORY_H */
+

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

@@ -148,7 +148,7 @@ drop table if exists marker_multi_delete;
 use my_replicated_db;
 
 insert into performance_schema.setup_actors
-  values ('FOO', 'FOO', 'FOO');
+  values ('FOO', 'FOO', 'FOO', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_tx_table.*, performance_schema.setup_actors.*
@@ -157,7 +157,7 @@ delete my_tx_table.*, performance_schema.setup_actors.*
   or performance_schema.setup_actors.role='FOO';
 
 insert into performance_schema.setup_actors
-  values ('BAR', 'BAR', 'BAR');
+  values ('BAR', 'BAR', 'BAR', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_non_tx_table.*, performance_schema.setup_actors.*
@@ -166,7 +166,7 @@ delete my_non_tx_table.*, performance_schema.setup_actors.*
   or performance_schema.setup_actors.role='BAR';
 
 insert into performance_schema.setup_actors
-  values ('BAZ', 'BAZ', 'BAZ');
+  values ('BAZ', 'BAZ', 'BAZ', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_bh_table.*, performance_schema.setup_actors.*
@@ -184,5 +184,5 @@ drop database my_replicated_db;
 # Restore performance_schema.setup_actors, damaged by this script
 
 truncate table performance_schema.setup_actors;
-insert into performance_schema.setup_actors values ('%', '%', '%');
+insert into performance_schema.setup_actors values ('%', '%', '%', 'YES', 'YES');
 

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

@@ -53,11 +53,14 @@
 
 --disable_query_log
 
+set @orig_sql_mode= @@sql_mode;
+set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
 grant ALL on *.* to user1@localhost;
 grant ALL on *.* to user2@localhost;
 grant ALL on *.* to user3@localhost;
 grant ALL on *.* to user4@localhost;
 grant ALL on *.* to user5@localhost;
+set sql_mode= @orig_sql_mode;
 
 flush privileges;
 

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

@@ -96,7 +96,7 @@ CREATE TABLE dup_table (c char(4));
 --ERROR ER_TABLE_EXISTS_ERROR
 CREATE TABLE dup_table (c char(4));
 DROP TABLE dup_table;
-INSERT INTO t11 VALUES("MySQL");
+INSERT IGNORE INTO t11 VALUES("MySQL");
 
 # -----------------------------------------------------------------------
 # Tests to show sub-statements for following statements are not

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

@@ -36,6 +36,12 @@ drop prepare dump_statements_host;
 drop prepare dump_statements_history;
 drop prepare dump_statements_global;
 
+drop prepare dump_transactions_account;
+drop prepare dump_transactions_user;
+drop prepare dump_transactions_host;
+drop prepare dump_transactions_history;
+drop prepare dump_transactions_global;
+
 drop prepare dump_users;
 drop prepare dump_hosts;
 drop prepare dump_accounts;
@@ -49,6 +55,7 @@ insert into performance_schema.setup_actors
   select * from test.setup_actors;
 drop table test.setup_actors;
 drop table test.t1;
+drop function test.f;
 
 update performance_schema.threads set instrumented='YES';
 update performance_schema.setup_instruments set enabled='YES', timed='YES';

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

+# Tests for the performance schema
+
+# ===========================================
+# HELPER include/memory_aggregate_cleanup.inc
+# ===========================================
+
+--disable_query_log
+revoke all privileges, grant option from user1@localhost;
+revoke all privileges, grant option from user2@localhost;
+revoke all privileges, grant option from user3@localhost;
+revoke all privileges, grant option from user4@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+flush privileges;
+
+drop procedure dump_thread;
+drop procedure dump_one_thread;
+
+drop prepare dump_memory_account;
+drop prepare dump_memory_user;
+drop prepare dump_memory_host;
+drop prepare dump_memory_global;
+
+drop prepare dump_users;
+drop prepare dump_hosts;
+drop prepare dump_accounts;
+
+truncate table performance_schema.accounts;
+truncate table performance_schema.users;
+truncate table performance_schema.hosts;
+
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+  select * from test.setup_actors;
+drop table test.setup_actors;
+
+set global query_cache_size=0;
+
+update performance_schema.threads set instrumented='YES';
+update performance_schema.setup_instruments set enabled='YES', timed='YES';
+
+--enable_query_log
+

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

+# 
+# Deallocates all the prepared statements 
+# created in prepares_stmts_setup.inc
+#
+
+DEALLOCATE PREPARE st1;
+DEALLOCATE PREPARE st2;
+DEALLOCATE PREPARE st3;
+DEALLOCATE PREPARE st4;
+
+DROP TABLE t1; 

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

+# 
+# Execution of all the prepared statements created in 
+# prepared_statements_setup.inc.
+# 
+
+SET @a = 3;
+SET @b = 4;
+EXECUTE st1 USING @a, @b;
+
+#SET @table = 't1';
+EXECUTE st2;
+
+SET @c=3;
+EXECUTE st3 using @c;
+
+EXECUTE st4;
+
+

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

+#
+# Creating various prepared statements. 
+# HELPER include/prepared_stmts_setup.inc 
+#
+
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (4), (8), (11), (32), (80);
+
+# Prepared statments
+
+PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse';
+
+SET @table = 't1';
+SET @s = CONCAT('SELECT * FROM ', @table);
+PREPARE st2 FROM @s;
+
+PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
+
+PREPARE st4 FROM
+  '(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';

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

+#
+# clean up of set-up created in 
+# suite/perfschema/include/program_setup.inc
+#
+
+--disable_warnings
+DROP PROCEDURE SampleProc1;
+DROP PROCEDURE SampleProc2;
+DROP PROCEDURE SampleProc3;
+DROP PROCEDURE SampleProc4;
+
+DROP FUNCTION wt_avg;
+DROP FUNCTION fac;
+DROP FUNCTION append;
+
+DROP TRIGGER trg1;
+DROP TRIGGER trg2;
+DROP TRIGGER trg3;
+DROP TRIGGER trg4;
+DROP TRIGGER trg5;
+
+DROP EVENT IF EXISTS e1;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE table_t;
+
+DROP DATABASE stored_programs;
+--enable_warnings

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

@@ -28,10 +28,13 @@
 
 --disable_query_log
 
+set @orig_sql_mode= @@sql_mode;
+set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
 grant ALL on *.* to user1@localhost;
 grant ALL on *.* to user2@localhost;
 grant ALL on *.* to user3@localhost;
 grant ALL on *.* to user4@localhost;
+set sql_mode= @orig_sql_mode;
 
 flush privileges;
 

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

+# Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
+# Server start with ambigous startup option 'performance-schema-max_=12' : pass
+# Server start with invalid startup option '--performance-schema-unknown_99' : pass
+# Server start with invalid startup option value '--datadir=bad_option_h_param' : pass