9 files changed, 9 insertions, 11 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index 0754bb5a7e7..c6077d7aa56 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -258,7 +258,7 @@ int ha_perfschema::close(void)
   DBUG_RETURN(0);
 }
 
-int ha_perfschema::write_row(uchar *buf)
+int ha_perfschema::write_row(const uchar *buf)
 {
   int result;
 
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index dd57ff31088..18ac035831d 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -127,7 +127,7 @@ public:
     @param buf the row to write
     @return 0 on success
   */
-  int write_row(uchar *buf);
+  int write_row(const uchar *buf);
 
   void use_hidden_primary_key();
 
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index 08ad7d31c88..144ebcddff4 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -185,7 +185,7 @@ ha_rows PFS_engine_table_share::get_row_count(void) const
   return m_records;
 }
 
-int PFS_engine_table_share::write_row(TABLE *table, unsigned char *buf,
+int PFS_engine_table_share::write_row(TABLE *table, const unsigned char *buf,
                                       Field **fields) const
 {
   my_bitmap_map *org_bitmap;
diff --git a/storage/perfschema/pfs_engine_table.h b/storage/perfschema/pfs_engine_table.h
index 52ad203db24..03a2b6a9d28 100644
--- a/storage/perfschema/pfs_engine_table.h
+++ b/storage/perfschema/pfs_engine_table.h
@@ -207,7 +207,7 @@ protected:
 typedef PFS_engine_table* (*pfs_open_table_t)(void);
 /** Callback to write a row. */
 typedef int (*pfs_write_row_t)(TABLE *table,
-                               unsigned char *buf, Field **fields);
+                               const unsigned char *buf, Field **fields);
 /** Callback to delete all rows. */
 typedef int (*pfs_delete_all_rows_t)(void);
 /** Callback to get a row count. */
@@ -224,7 +224,7 @@ struct PFS_engine_table_share
   /** Get the row count. */
   ha_rows get_row_count(void) const;
   /** Write a row. */
-  int write_row(TABLE *table, unsigned char *buf, Field **fields) const;
+  int write_row(TABLE *table, const unsigned char *buf, Field **fields) const;
 
   /** Table name. */
   LEX_STRING m_name;
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index 71c384d0555..b05f6ad004b 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -59,7 +59,7 @@ PFS_engine_table* table_setup_actors::create()
   return new table_setup_actors();
 }
 
-int table_setup_actors::write_row(TABLE *table, unsigned char *buf,
+int table_setup_actors::write_row(TABLE *table, const unsigned char *buf,
                                   Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_setup_actors.h b/storage/perfschema/table_setup_actors.h
index 748c57850b0..6bfc480a9c5 100644
--- a/storage/perfschema/table_setup_actors.h
+++ b/storage/perfschema/table_setup_actors.h
@@ -62,7 +62,7 @@ public:
   static PFS_engine_table_share m_share;
   /** Table builder. */
   static PFS_engine_table* create();
-  static int write_row(TABLE *table, unsigned char *buf, Field **fields);
+  static int write_row(TABLE *table, const unsigned char *buf, Field **fields);
   static int delete_all_rows();
   static ha_rows get_row_count();
 
diff --git a/storage/perfschema/table_setup_objects.cc b/storage/perfschema/table_setup_objects.cc
index af6481ae98c..f3d11b7f26f 100644
--- a/storage/perfschema/table_setup_objects.cc
+++ b/storage/perfschema/table_setup_objects.cc
@@ -73,7 +73,7 @@ PFS_engine_table* table_setup_objects::create(void)
   return new table_setup_objects();
 }
 
-int table_setup_objects::write_row(TABLE *table, unsigned char *buf,
+int table_setup_objects::write_row(TABLE *table, const unsigned char *buf,
                                    Field **fields)
 {
   int result;
diff --git a/storage/perfschema/table_setup_objects.h b/storage/perfschema/table_setup_objects.h
index 560346c577f..570acc865ad 100644
--- a/storage/perfschema/table_setup_objects.h
+++ b/storage/perfschema/table_setup_objects.h
@@ -65,7 +65,7 @@ public:
   static PFS_engine_table_share m_share;
   /** Table builder. */
   static PFS_engine_table* create();
-  static int write_row(TABLE *table, unsigned char *buf, Field **fields);
+  static int write_row(TABLE *table, const unsigned char *buf, Field **fields);
   static int delete_all_rows();
   static ha_rows get_row_count();
 
diff --git a/storage/perfschema/unittest/pfs_server_stubs.cc b/storage/perfschema/unittest/pfs_server_stubs.cc
index db1600faf9f..0cabce37e51 100644
--- a/storage/perfschema/unittest/pfs_server_stubs.cc
+++ b/storage/perfschema/unittest/pfs_server_stubs.cc
@@ -31,8 +31,6 @@
 
 struct sql_digest_storage;
 
-volatile bool ready_to_exit= false;
-
 uint lower_case_table_names= 0;
 CHARSET_INFO *files_charset_info= NULL;
 CHARSET_INFO *system_charset_info= NULL;