Rebased the branch on top of 10.5 as of a039b088.

storage/clustrixdb/ha_clustrixdb.cc

@@ -341,7 +341,7 @@ int ha_clustrixdb::reset()
   return 0;
 }
 
-int ha_clustrixdb::write_row(uchar *buf)
+int ha_clustrixdb::write_row(const uchar *buf)
 {
   int error_code = 0;
   THD *thd = ha_thd();

storage/clustrixdb/ha_clustrixdb.h

@@ -52,7 +52,7 @@ class ha_clustrixdb : public handler
   int open(const char *name, int mode, uint test_if_locked);
   int close(void);
   int reset();
-  int write_row(uchar *buf);
+  int write_row(const uchar *buf);
   // start_bulk_update exec_bulk_update
   int update_row(const uchar *old_data, const uchar *new_data);
   // start_bulk_delete exec_bulk_delete

storage/clustrixdb/ha_clustrixdb_pushdown.cc

@@ -55,7 +55,13 @@ int get_field_types(THD *thd, SELECT_LEX *sl, uchar *fieldtype,
   bzero(field_metadata, (tmp_table_param.field_count * 2));
   for (unsigned int i= 0 ; i < tmp_table_param.field_count ; i++)
   {
-    metadata_index+= tmp_table->field[i]->save_field_metadata(&field_metadata[metadata_index]);
+    Binlog_type_info bti= tmp_table->field[i]->binlog_type_info();
+    uchar *ptr = reinterpret_cast<uchar*>(&bti.m_metadata);
+    // Binlog_type_info::m_metadata is u16
+    if (bti.m_metadata_size == 1)
+        field_metadata[metadata_index++]= *ptr++;
+    if (bti.m_metadata_size == 2)
+        field_metadata[metadata_index++]= *ptr++;
   }
 
   if (metadata_index < 251)