Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

16 files changed, 18 insertions, 18 deletions

diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index 57dd266fb3d..ecce3c5e627 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -275,7 +275,7 @@ void ha_perfschema::use_hidden_primary_key(void)
   table->column_bitmaps_set_no_signal(&table->s->all_set, table->write_set);
 }
 
-int ha_perfschema::update_row(const uchar *old_data, uchar *new_data)
+int ha_perfschema::update_row(const uchar *old_data, const uchar *new_data)
 {
   DBUG_ENTER("ha_perfschema::update_row");
   if (!pfs_initialized)
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index ff87b1fd665..62996e12fe0 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -130,7 +130,7 @@ public:
     @param new_data the row new values
     @return 0 on success
   */
-  int update_row(const uchar *old_data, uchar *new_data);
+  int update_row(const uchar *old_data, const uchar *new_data);
 
   /**
     Delete a row.
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index 9e9ab02df46..579d3ccd74e 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -284,7 +284,7 @@ int PFS_engine_table::read_row(TABLE *table,
 */
 int PFS_engine_table::update_row(TABLE *table,
                                  const unsigned char *old_buf,
-                                 unsigned char *new_buf,
+                                 const unsigned char *new_buf,
                                  Field **fields)
 {
   my_bitmap_map *org_bitmap;
@@ -428,7 +428,7 @@ PFS_engine_table::get_field_varchar_utf8(Field *f, String *val)
 
 int PFS_engine_table::update_row_values(TABLE *,
                                         const unsigned char *,
-                                        unsigned char *,
+                                        const unsigned char *,
                                         Field **)
 {
   return HA_ERR_WRONG_COMMAND;
diff --git a/storage/perfschema/pfs_engine_table.h b/storage/perfschema/pfs_engine_table.h
index 2bbf8891420..bae27172810 100644
--- a/storage/perfschema/pfs_engine_table.h
+++ b/storage/perfschema/pfs_engine_table.h
@@ -46,7 +46,7 @@ public:
   int read_row(TABLE *table, unsigned char *buf, Field **fields);
 
   int update_row(TABLE *table, const unsigned char *old_buf,
-                 unsigned char *new_buf, Field **fields);
+                 const unsigned char *new_buf, Field **fields);
 
   /**
     Delete a row from this table.
@@ -165,7 +165,7 @@ protected:
     @param fields           Table fields
   */
   virtual int update_row_values(TABLE *table, const unsigned char *old_buf,
-                                unsigned char *new_buf, Field **fields);
+                                const unsigned char *new_buf, Field **fields);
 
   /**
     Delete a row.
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index c82d67fba2d..bf6006057df 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -217,7 +217,7 @@ int table_setup_actors::read_row_values(TABLE *table,
 
 int table_setup_actors::update_row_values(TABLE *table,
                                           const unsigned char *old_buf,
-                                          unsigned char *new_buf,
+                                          const unsigned char *new_buf,
                                           Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_setup_actors.h b/storage/perfschema/table_setup_actors.h
index 2a9395dfac7..66379593cc5 100644
--- a/storage/perfschema/table_setup_actors.h
+++ b/storage/perfschema/table_setup_actors.h
@@ -71,7 +71,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
   virtual int delete_row_values(TABLE *table,
diff --git a/storage/perfschema/table_setup_consumers.cc b/storage/perfschema/table_setup_consumers.cc
index c09853ffeca..f3529eb8846 100644
--- a/storage/perfschema/table_setup_consumers.cc
+++ b/storage/perfschema/table_setup_consumers.cc
@@ -190,7 +190,7 @@ int table_setup_consumers::read_row_values(TABLE *table,
 
 int table_setup_consumers::update_row_values(TABLE *table,
                                              const unsigned char *,
-                                             unsigned char *,
+                                             const unsigned char *,
                                              Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_setup_consumers.h b/storage/perfschema/table_setup_consumers.h
index e59033c0ad1..f5a386829a1 100644
--- a/storage/perfschema/table_setup_consumers.h
+++ b/storage/perfschema/table_setup_consumers.h
@@ -60,7 +60,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
   table_setup_consumers();
diff --git a/storage/perfschema/table_setup_instruments.cc b/storage/perfschema/table_setup_instruments.cc
index d911128ce94..f5ac1cafe63 100644
--- a/storage/perfschema/table_setup_instruments.cc
+++ b/storage/perfschema/table_setup_instruments.cc
@@ -217,7 +217,7 @@ int table_setup_instruments::read_row_values(TABLE *table,
 
 int table_setup_instruments::update_row_values(TABLE *table,
                                                const unsigned char *,
-                                               unsigned char *,
+                                               const unsigned char *,
                                                Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_setup_instruments.h b/storage/perfschema/table_setup_instruments.h
index 2e70a528bbd..dfe9070721b 100644
--- a/storage/perfschema/table_setup_instruments.h
+++ b/storage/perfschema/table_setup_instruments.h
@@ -92,7 +92,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
   table_setup_instruments();
diff --git a/storage/perfschema/table_setup_objects.cc b/storage/perfschema/table_setup_objects.cc
index 5321271a62d..994622f4a52 100644
--- a/storage/perfschema/table_setup_objects.cc
+++ b/storage/perfschema/table_setup_objects.cc
@@ -265,7 +265,7 @@ int table_setup_objects::read_row_values(TABLE *table,
 
 int table_setup_objects::update_row_values(TABLE *table,
                                            const unsigned char *,
-                                           unsigned char *,
+                                           const unsigned char *,
                                            Field **fields)
 {
   int result;
diff --git a/storage/perfschema/table_setup_objects.h b/storage/perfschema/table_setup_objects.h
index 55423ffd90f..7fcefa45407 100644
--- a/storage/perfschema/table_setup_objects.h
+++ b/storage/perfschema/table_setup_objects.h
@@ -74,7 +74,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
   virtual int delete_row_values(TABLE *table,
diff --git a/storage/perfschema/table_setup_timers.cc b/storage/perfschema/table_setup_timers.cc
index 911fa121e06..9c6af49595d 100644
--- a/storage/perfschema/table_setup_timers.cc
+++ b/storage/perfschema/table_setup_timers.cc
@@ -145,7 +145,7 @@ int table_setup_timers::read_row_values(TABLE *table,
 
 int table_setup_timers::update_row_values(TABLE *table,
                                           const unsigned char *,
-                                          unsigned char *,
+                                          const unsigned char *,
                                           Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_setup_timers.h b/storage/perfschema/table_setup_timers.h
index 46af68bb9e3..f230a68af98 100644
--- a/storage/perfschema/table_setup_timers.h
+++ b/storage/perfschema/table_setup_timers.h
@@ -58,7 +58,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
   table_setup_timers();
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index 5c78b567b8c..7be51b2bb20 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -292,7 +292,7 @@ int table_threads::read_row_values(TABLE *table,
 
 int table_threads::update_row_values(TABLE *table,
                                      const unsigned char *old_buf,
-                                     unsigned char *new_buf,
+                                     const unsigned char *new_buf,
                                      Field **fields)
 {
   Field *f;
diff --git a/storage/perfschema/table_threads.h b/storage/perfschema/table_threads.h
index 10afbe14e74..fb843f5ca36 100644
--- a/storage/perfschema/table_threads.h
+++ b/storage/perfschema/table_threads.h
@@ -87,7 +87,7 @@ protected:
 
   virtual int update_row_values(TABLE *table,
                                 const unsigned char *old_buf,
-                                unsigned char *new_buf,
+                                const unsigned char *new_buf,
                                 Field **fields);
 
 protected: