Fixed compiler warnings

42 files changed, 46 insertions, 42 deletions

diff --git a/storage/connect/block.h b/storage/connect/block.h
index 963cfa42f32..20db70351e4 100644
--- a/storage/connect/block.h
+++ b/storage/connect/block.h
@@ -51,7 +51,10 @@ if (debug != NULL)
 #if !defined(__BORLANDC__)
   // Avoid warning C4291 by defining a matching dummy delete operator
   void operator delete(void *, PGLOBAL, void *) {}
+  void operator delete(void *ptr,size_t size) {}
 #endif
+  virtual ~BLOCK() {}
+
   }; // end of class BLOCK
 
 #endif   // !BLOCK_DEFINED
diff --git a/storage/connect/csort.h b/storage/connect/csort.h
index 702152de43e..1808f640788 100644
--- a/storage/connect/csort.h
+++ b/storage/connect/csort.h
@@ -35,7 +35,7 @@ class DllExport CSORT {
  public:
   // Constructor
   CSORT(bool cns, int th = THRESH, int mth = MTHRESH);
-
+  virtual ~CSORT() {}
  protected:
   // Implementation
   /*********************************************************************/
diff --git a/storage/connect/fmdlex.c b/storage/connect/fmdlex.c
index a7213b1ed57..7a7cd1ad753 100644
--- a/storage/connect/fmdlex.c
+++ b/storage/connect/fmdlex.c
@@ -401,7 +401,7 @@ char *yytext;
 #define YYSTATE    ((yy_start-1)/2)
 #undef  YY_INPUT
 #define YY_INPUT(buf,n,m) \
-  {n=(m<strlen(pp->Curp))?m:strlen(pp->Curp);strncpy(buf,pp->Curp,n);pp->Curp+=n;}
+  {n=((int) m< (int) strlen(pp->Curp))? (int) m: (int) strlen(pp->Curp);strncpy(buf,pp->Curp,n);pp->Curp+=n;}
 #if defined(UNIX)
 #undef  yywrap
 #define yywrap  ddwrap
@@ -458,7 +458,7 @@ YY_MALLOC_DECL
   if ( yy_current_buffer->yy_is_interactive ) \
     { \
     int c = getc( yyin ); \
-    result = c == EOF ? 0 : 1; \
+    result = c == (int) EOF ? 0 : 1;             \
     buf[0] = (char) c; \
     } \
   else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
diff --git a/storage/connect/inihandl.c b/storage/connect/inihandl.c
index f0637155f2d..1c1884c0144 100644
--- a/storage/connect/inihandl.c
+++ b/storage/connect/inihandl.c
@@ -152,7 +152,7 @@ static void PROFILE_CopyEntry( char *buffer, const char *value, uint len,
       if (!p2)
         continue;  /* ignore it */
 
-      strncpy(env_val, p + 2, min(sizeof(env_val), (int)(p2-p)-1));
+      strncpy(env_val, p + 2, min((int) sizeof(env_val), (int)(p2-p)-1));
 
       if ((env_p = getenv(env_val)) != NULL) {
         int buffer_len;
diff --git a/storage/connect/osutil.c b/storage/connect/osutil.c
index ad92caefe95..5570e55f3b2 100644
--- a/storage/connect/osutil.c
+++ b/storage/connect/osutil.c
@@ -108,7 +108,7 @@ void _splitpath(LPCSTR name, LPSTR drive, LPSTR dir, LPSTR fn, LPSTR ft)
 /***********************************************************************/
 /*  Define the makepath function not existing in the UNIX library.     */
 /***********************************************************************/
-void _makepath(LPSTR name, LPCSTR drive, LPCSTR dir, LPCSTR fn, LPCSTR ft)
+void _makepath(LPSTR name, LPCSTR drive __attribute__((unused)), LPCSTR dir, LPCSTR fn, LPCSTR ft)
   {
   int n;
 
@@ -196,7 +196,7 @@ char *_fullpath(char *absPath, const char *relPath, size_t maxLength)
   return absPath;
   }  /* end of _fullpath */
 
-BOOL MessageBeep(uint i)
+BOOL MessageBeep(uint i __attribute__((unused)))
   {
   // Fixme
   return TRUE;
diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 7910f1ea318..ec2ac399ad0 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -447,7 +447,7 @@ void *PlugAllocMem(PGLOBAL g, uint size)
 /*  Here there should be some verification done such as validity of    */
 /*  the address and size not larger than memory size.                  */
 /***********************************************************************/
-BOOL PlugSubSet(PGLOBAL g, void *memp, uint size)
+BOOL PlugSubSet(PGLOBAL g __attribute__((unused)), void *memp, uint size)
   {
   PPOOLHEADER pph = memp;
 
diff --git a/storage/connect/tabtbl.h b/storage/connect/tabtbl.h
index 6b29e8eed6e..48371e40ade 100644
--- a/storage/connect/tabtbl.h
+++ b/storage/connect/tabtbl.h
@@ -117,6 +117,7 @@ class TBTBLK : public TIDBLK {
 #if !defined(__BORLANDC__)
   // Avoid warning C4291 by defining a matching dummy delete operator
   void operator delete(void *, TIDBLK*) {}
+  void operator delete(void *, size_t size) {}
 #endif
 
  protected:
diff --git a/storage/connect/tabutil.h b/storage/connect/tabutil.h
index 56c4667b258..9bfa4b726d1 100644
--- a/storage/connect/tabutil.h
+++ b/storage/connect/tabutil.h
@@ -70,7 +70,7 @@ class DllExport TDBPRX : public TDBASE {
   virtual int   GetRecpos(void) {return Tdbp->GetRecpos();}
 	virtual void  ResetDB(void) {Tdbp->ResetDB();}
 	virtual int   RowNumber(PGLOBAL g, bool b = FALSE);
-  virtual PSZ   GetServer(void) {return (Tdbp) ? Tdbp->GetServer() : "?";}
+        virtual PSZ   GetServer(void) {return (Tdbp) ? Tdbp->GetServer() : (char*) "?";}
 
   // Database routines
 	virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
diff --git a/storage/perfschema/table_accounts.cc b/storage/perfschema/table_accounts.cc
index 92a5d264a44..eb14a0fe481 100644
--- a/storage/perfschema/table_accounts.cc
+++ b/storage/perfschema/table_accounts.cc
@@ -49,7 +49,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_accounts::m_field_def=
-{ 4, field_types };
+{ 4, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_accounts::m_share=
diff --git a/storage/perfschema/table_esgs_by_account_by_event_name.cc b/storage/perfschema/table_esgs_by_account_by_event_name.cc
index e36a0d0d00a..aaf18a5475b 100644
--- a/storage/perfschema/table_esgs_by_account_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_account_by_event_name.cc
@@ -75,7 +75,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esgs_by_account_by_event_name::m_field_def=
-{ 8, field_types };
+{ 8, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esgs_by_account_by_event_name::m_share=
diff --git a/storage/perfschema/table_esgs_by_host_by_event_name.cc b/storage/perfschema/table_esgs_by_host_by_event_name.cc
index 2357d899116..dd64d2f6e9d 100644
--- a/storage/perfschema/table_esgs_by_host_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_host_by_event_name.cc
@@ -71,7 +71,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esgs_by_host_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esgs_by_host_by_event_name::m_share=
diff --git a/storage/perfschema/table_esgs_by_thread_by_event_name.cc b/storage/perfschema/table_esgs_by_thread_by_event_name.cc
index eeef6c3fbb2..8a4d67695fa 100644
--- a/storage/perfschema/table_esgs_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_thread_by_event_name.cc
@@ -70,7 +70,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esgs_by_thread_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esgs_by_thread_by_event_name::m_share=
diff --git a/storage/perfschema/table_esgs_by_user_by_event_name.cc b/storage/perfschema/table_esgs_by_user_by_event_name.cc
index c7aff6fdb8d..0e94ed162c4 100644
--- a/storage/perfschema/table_esgs_by_user_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_user_by_event_name.cc
@@ -71,7 +71,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esgs_by_user_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esgs_by_user_by_event_name::m_share=
diff --git a/storage/perfschema/table_esgs_global_by_event_name.cc b/storage/perfschema/table_esgs_global_by_event_name.cc
index 276ac8d7704..1dea1f8aceb 100644
--- a/storage/perfschema/table_esgs_global_by_event_name.cc
+++ b/storage/perfschema/table_esgs_global_by_event_name.cc
@@ -67,7 +67,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esgs_global_by_event_name::m_field_def=
-{ 6, field_types };
+{ 6, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esgs_global_by_event_name::m_share=
diff --git a/storage/perfschema/table_esms_by_account_by_event_name.cc b/storage/perfschema/table_esms_by_account_by_event_name.cc
index 77f87182945..c6a4ba5cf31 100644
--- a/storage/perfschema/table_esms_by_account_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_account_by_event_name.cc
@@ -170,7 +170,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_by_account_by_event_name::m_field_def=
-{ 27, field_types };
+{ 27, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_by_account_by_event_name::m_share=
diff --git a/storage/perfschema/table_esms_by_digest.cc b/storage/perfschema/table_esms_by_digest.cc
index d0250c14e5d..a31572d5f6b 100644
--- a/storage/perfschema/table_esms_by_digest.cc
+++ b/storage/perfschema/table_esms_by_digest.cc
@@ -184,7 +184,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_by_digest::m_field_def=
-{ 29, field_types };
+{ 29, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_by_digest::m_share=
diff --git a/storage/perfschema/table_esms_by_host_by_event_name.cc b/storage/perfschema/table_esms_by_host_by_event_name.cc
index 57aaf7602c4..8d68b2c948c 100644
--- a/storage/perfschema/table_esms_by_host_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_host_by_event_name.cc
@@ -166,7 +166,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_by_host_by_event_name::m_field_def=
-{ 26, field_types };
+{ 26, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_by_host_by_event_name::m_share=
diff --git a/storage/perfschema/table_esms_by_thread_by_event_name.cc b/storage/perfschema/table_esms_by_thread_by_event_name.cc
index fccdf5dea60..d1e6105e0a8 100644
--- a/storage/perfschema/table_esms_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_thread_by_event_name.cc
@@ -165,7 +165,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_by_thread_by_event_name::m_field_def=
-{ 26, field_types };
+{ 26, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_by_thread_by_event_name::m_share=
diff --git a/storage/perfschema/table_esms_by_user_by_event_name.cc b/storage/perfschema/table_esms_by_user_by_event_name.cc
index d65a255e280..48e9026c575 100644
--- a/storage/perfschema/table_esms_by_user_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_user_by_event_name.cc
@@ -166,7 +166,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_by_user_by_event_name::m_field_def=
-{ 26, field_types };
+{ 26, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_by_user_by_event_name::m_share=
diff --git a/storage/perfschema/table_esms_global_by_event_name.cc b/storage/perfschema/table_esms_global_by_event_name.cc
index efcb5b6fa7c..57522cb466d 100644
--- a/storage/perfschema/table_esms_global_by_event_name.cc
+++ b/storage/perfschema/table_esms_global_by_event_name.cc
@@ -162,7 +162,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_esms_global_by_event_name::m_field_def=
-{ 25, field_types };
+{ 25, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_esms_global_by_event_name::m_share=
diff --git a/storage/perfschema/table_events_stages.cc b/storage/perfschema/table_events_stages.cc
index 854e1be15cd..08a977987dd 100644
--- a/storage/perfschema/table_events_stages.cc
+++ b/storage/perfschema/table_events_stages.cc
@@ -84,7 +84,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_events_stages_current::m_field_def=
-{10 , field_types };
+{10 , field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_events_stages_current::m_share=
diff --git a/storage/perfschema/table_events_statements.cc b/storage/perfschema/table_events_statements.cc
index fb2b4b242d4..638284003dc 100644
--- a/storage/perfschema/table_events_statements.cc
+++ b/storage/perfschema/table_events_statements.cc
@@ -237,7 +237,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_events_statements_current::m_field_def=
-{40 , field_types };
+{40 , field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_events_statements_current::m_share=
diff --git a/storage/perfschema/table_events_waits_summary.cc b/storage/perfschema/table_events_waits_summary.cc
index f437e83f3ff..a7130c14a29 100644
--- a/storage/perfschema/table_events_waits_summary.cc
+++ b/storage/perfschema/table_events_waits_summary.cc
@@ -69,7 +69,7 @@ static const TABLE_FIELD_TYPE ews_by_instance_field_types[]=
 
 TABLE_FIELD_DEF
 table_events_waits_summary_by_instance::m_field_def=
-{ 7, ews_by_instance_field_types };
+{ 7, ews_by_instance_field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_events_waits_summary_by_instance::m_share=
diff --git a/storage/perfschema/table_ews_by_account_by_event_name.cc b/storage/perfschema/table_ews_by_account_by_event_name.cc
index 992e7c18f17..0b345cb9d83 100644
--- a/storage/perfschema/table_ews_by_account_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_account_by_event_name.cc
@@ -75,7 +75,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_ews_by_account_by_event_name::m_field_def=
-{ 8, field_types };
+{ 8, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_ews_by_account_by_event_name::m_share=
diff --git a/storage/perfschema/table_ews_by_host_by_event_name.cc b/storage/perfschema/table_ews_by_host_by_event_name.cc
index 8a62990c8ed..ea96a040d88 100644
--- a/storage/perfschema/table_ews_by_host_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_host_by_event_name.cc
@@ -71,7 +71,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_ews_by_host_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_ews_by_host_by_event_name::m_share=
diff --git a/storage/perfschema/table_ews_by_thread_by_event_name.cc b/storage/perfschema/table_ews_by_thread_by_event_name.cc
index 4db97b1c98c..3f21b0625d3 100644
--- a/storage/perfschema/table_ews_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_thread_by_event_name.cc
@@ -70,7 +70,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_ews_by_thread_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_ews_by_thread_by_event_name::m_share=
diff --git a/storage/perfschema/table_ews_by_user_by_event_name.cc b/storage/perfschema/table_ews_by_user_by_event_name.cc
index 8a169019e87..e1f852aa6d5 100644
--- a/storage/perfschema/table_ews_by_user_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_user_by_event_name.cc
@@ -71,7 +71,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_ews_by_user_by_event_name::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_ews_by_user_by_event_name::m_share=
diff --git a/storage/perfschema/table_file_summary_by_event_name.cc b/storage/perfschema/table_file_summary_by_event_name.cc
index 7e72f4d4158..33bee172806 100644
--- a/storage/perfschema/table_file_summary_by_event_name.cc
+++ b/storage/perfschema/table_file_summary_by_event_name.cc
@@ -156,7 +156,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_file_summary_by_event_name::m_field_def=
-{ 23, field_types };
+{ 23, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_file_summary_by_event_name::m_share=
diff --git a/storage/perfschema/table_file_summary_by_instance.cc b/storage/perfschema/table_file_summary_by_instance.cc
index 40478647f5b..c0bf1c29307 100644
--- a/storage/perfschema/table_file_summary_by_instance.cc
+++ b/storage/perfschema/table_file_summary_by_instance.cc
@@ -165,7 +165,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_file_summary_by_instance::m_field_def=
-{ 25, field_types };
+{ 25, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_file_summary_by_instance::m_share=
diff --git a/storage/perfschema/table_host_cache.cc b/storage/perfschema/table_host_cache.cc
index 02c7f72140a..879c7ef4860 100644
--- a/storage/perfschema/table_host_cache.cc
+++ b/storage/perfschema/table_host_cache.cc
@@ -176,7 +176,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_host_cache::m_field_def=
-{ 29, field_types };
+{ 29, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_host_cache::m_share=
diff --git a/storage/perfschema/table_hosts.cc b/storage/perfschema/table_hosts.cc
index 8e919ec0724..c91193ea83e 100644
--- a/storage/perfschema/table_hosts.cc
+++ b/storage/perfschema/table_hosts.cc
@@ -45,7 +45,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_hosts::m_field_def=
-{ 3, field_types };
+{ 3, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_hosts::m_share=
diff --git a/storage/perfschema/table_os_global_by_type.cc b/storage/perfschema/table_os_global_by_type.cc
index 70d9d6819ac..0acc7582ac5 100644
--- a/storage/perfschema/table_os_global_by_type.cc
+++ b/storage/perfschema/table_os_global_by_type.cc
@@ -74,7 +74,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_os_global_by_type::m_field_def=
-{ 8, field_types };
+{ 8, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_os_global_by_type::m_share=
diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc
index bd905b5756c..073c9881a85 100644
--- a/storage/perfschema/table_session_connect.cc
+++ b/storage/perfschema/table_session_connect.cc
@@ -40,7 +40,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 };
 
 TABLE_FIELD_DEF table_session_connect::m_field_def=
-{ 4, field_types };
+{ 4, field_types, 0, (uint*) 0 };
 
 table_session_connect::table_session_connect(const PFS_engine_table_share *share) :
                        cursor_by_thread_connect_attr(share)
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index 91dbb942ead..ead22c23319 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -50,7 +50,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_setup_actors::m_field_def=
-{ 3, field_types };
+{ 3, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_setup_actors::m_share=
diff --git a/storage/perfschema/table_setup_objects.cc b/storage/perfschema/table_setup_objects.cc
index 11fab913ac4..4753285d277 100644
--- a/storage/perfschema/table_setup_objects.cc
+++ b/storage/perfschema/table_setup_objects.cc
@@ -61,7 +61,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_setup_objects::m_field_def=
-{ 5, field_types };
+{ 5, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_setup_objects::m_share=
diff --git a/storage/perfschema/table_socket_instances.cc b/storage/perfschema/table_socket_instances.cc
index 0fa1d2b1a3a..6dfea0bf8be 100644
--- a/storage/perfschema/table_socket_instances.cc
+++ b/storage/perfschema/table_socket_instances.cc
@@ -69,7 +69,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_socket_instances::m_field_def=
-{ 7, field_types };
+{ 7, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_socket_instances::m_share=
diff --git a/storage/perfschema/table_socket_summary_by_event_name.cc b/storage/perfschema/table_socket_summary_by_event_name.cc
index 0262178e5b5..07bc9c9389a 100644
--- a/storage/perfschema/table_socket_summary_by_event_name.cc
+++ b/storage/perfschema/table_socket_summary_by_event_name.cc
@@ -156,7 +156,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_socket_summary_by_event_name::m_field_def=
-{ 23, field_types };
+{ 23, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_socket_summary_by_event_name::m_share=
diff --git a/storage/perfschema/table_socket_summary_by_instance.cc b/storage/perfschema/table_socket_summary_by_instance.cc
index 784c83fedfa..3d092b9b1d0 100644
--- a/storage/perfschema/table_socket_summary_by_instance.cc
+++ b/storage/perfschema/table_socket_summary_by_instance.cc
@@ -160,7 +160,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_socket_summary_by_instance::m_field_def=
-{ 24, field_types };
+{ 24, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_socket_summary_by_instance::m_share=
diff --git a/storage/perfschema/table_tiws_by_index_usage.cc b/storage/perfschema/table_tiws_by_index_usage.cc
index 71455793516..5f6d0cd2b5a 100644
--- a/storage/perfschema/table_tiws_by_index_usage.cc
+++ b/storage/perfschema/table_tiws_by_index_usage.cc
@@ -230,7 +230,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_tiws_by_index_usage::m_field_def=
-{ 39, field_types };
+{ 39, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_tiws_by_index_usage::m_share=
diff --git a/storage/perfschema/table_tiws_by_table.cc b/storage/perfschema/table_tiws_by_table.cc
index f793b5654a2..5e78c8d8b1c 100644
--- a/storage/perfschema/table_tiws_by_table.cc
+++ b/storage/perfschema/table_tiws_by_table.cc
@@ -225,7 +225,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_tiws_by_table::m_field_def=
-{ 38, field_types };
+{ 38, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_tiws_by_table::m_share=
diff --git a/storage/perfschema/table_tlws_by_table.cc b/storage/perfschema/table_tlws_by_table.cc
index c6f454ac178..df2d301e352 100644
--- a/storage/perfschema/table_tlws_by_table.cc
+++ b/storage/perfschema/table_tlws_by_table.cc
@@ -400,7 +400,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_tlws_by_table::m_field_def=
-{ 73, field_types };
+{ 73, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_tlws_by_table::m_share=
diff --git a/storage/perfschema/table_users.cc b/storage/perfschema/table_users.cc
index c0d85017ebc..1f6b861342d 100644
--- a/storage/perfschema/table_users.cc
+++ b/storage/perfschema/table_users.cc
@@ -45,7 +45,7 @@ static const TABLE_FIELD_TYPE field_types[]=
 
 TABLE_FIELD_DEF
 table_users::m_field_def=
-{ 3, field_types };
+{ 3, field_types, 0, (uint*) 0 };
 
 PFS_engine_table_share
 table_users::m_share=