diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index e663cd522..04fd9053a 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -146,7 +146,7 @@ static int columnstore_init_func(void* p)
 #ifndef _MSC_VER
     (void) pthread_mutex_init(&mcs_mutex, MY_MUTEX_INIT_FAST);
 #endif
-    (void) my_hash_init(&mcs_open_tables, system_charset_info, 32, 0, 0,
+    (void) my_hash_init(PSI_NOT_INSTRUMENTED, &mcs_open_tables, system_charset_info, 32, 0, 0,
                         (my_hash_get_key) mcs_get_key, 0, 0);
 
     mcs_hton->create =  mcs_create_handler;
@@ -909,7 +909,7 @@ int ha_mcs::external_lock(THD* thd, int lock_type)
     {
         //@Bug 2526 Only register the transaction when autocommit is off
         if ((thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
-            trans_register_ha( thd, true, mcs_hton);
+            trans_register_ha( thd, true, mcs_hton, 0);
 
         rc = ha_mcs_impl_external_lock(thd, table, lock_type);
     }
diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 881b99917..6a40e4992 100755
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -2382,7 +2382,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
                     sc->oid(oidlist[j].objnum);
 
                     // @bug 3003. Keep column alias if it has.
-                    sc->alias(ifp->is_autogenerated_name ? tcn.column : ifp->name.str);
+                    sc->alias(ifp->is_autogenerated_name() ? tcn.column : ifp->name.str);
 
                     sc->tableAlias(lower(gwi.tbList[i].alias));
                     sc->viewName(lower(viewName));
@@ -2440,7 +2440,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
                         sc->columnName(col->columnName());
 
                     // @bug 3003. Keep column alias if it has.
-                    sc->alias(ifp->is_autogenerated_name ? cols[j]->alias() : ifp->name.str);
+                    sc->alias(ifp->is_autogenerated_name() ? cols[j]->alias() : ifp->name.str);
                     sc->tableName(csep->derivedTbAlias());
                     sc->colPosition(j);
                     string tableAlias(csep->derivedTbAlias());
@@ -6677,7 +6677,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
                     ifp->print(&str, QT_ORDINARY);
                     fullname = str.c_ptr();
 
-                    if (ifp->is_autogenerated_name) // no alias
+                    if (ifp->is_autogenerated_name()) // no alias
                     {
                         sc->alias(fullname);
                     }
@@ -7281,7 +7281,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
                     gwi.groupByCols.push_back(srcp);
                     continue;
                 }
-                else if (!groupItem->is_autogenerated_name) // alias
+                else if (!groupItem->is_autogenerated_name()) // alias
                 {
                     uint32_t i = 0;
 
@@ -8690,7 +8690,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
                     ifp->print(&str, QT_ORDINARY);
                     fullname = str.c_ptr();
 
-                    if (ifp->is_autogenerated_name) // no alias
+                    if (ifp->is_autogenerated_name()) // no alias
                     {
                         sc->alias(fullname);
                     }
@@ -9288,7 +9288,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
                     gwi.groupByCols.push_back(srcp);
                     continue;
                 }
-                else if (!groupItem->is_autogenerated_name) // alias
+                else if (!groupItem->is_autogenerated_name()) // alias
                 {
                     uint32_t i = 0;
 
diff --git a/dbcon/mysql/sm.cpp b/dbcon/mysql/sm.cpp
index 9925c3c8b..b1a1dad63 100644
--- a/dbcon/mysql/sm.cpp
+++ b/dbcon/mysql/sm.cpp
@@ -553,7 +553,7 @@ MYSQL_RES* mysql_use_result(MYSQL* mysql)
         DBUG_RETURN(0);
     }
 
-    if (!(result = (MYSQL_RES*) my_malloc(sizeof(*result) +
+    if (!(result = (MYSQL_RES*) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*result) +
                                           sizeof(ulong) * mysql->field_count,
                                           MYF(MY_WME | MY_ZEROFILL))))
         DBUG_RETURN(0);
@@ -562,7 +562,7 @@ MYSQL_RES* mysql_use_result(MYSQL* mysql)
     result->methods = mysql->methods;
 
     if (!(result->row = (MYSQL_ROW)
-                        my_malloc(sizeof(result->row[0]) * (mysql->field_count + 1), MYF(MY_WME))))
+                        my_malloc(PSI_NOT_INSTRUMENTED, sizeof(result->row[0]) * (mysql->field_count + 1), MYF(MY_WME))))
     {
         /* Ptrs: to one row */
         my_free(result);