Pass C strings to get_table_oid.

storage/xpand/ha_xpand.cc

@@ -434,8 +434,9 @@ int ha_xpand::create(const char *name, TABLE *form, HA_CREATE_INFO *info)
     return error_code;
 
   // Load the oid of the created table
-  error_code= trx->get_table_oid(norm_db, norm_table, &xpand_table_oid,
-                                 table_share);
+  error_code= trx->get_table_oid(norm_db.c_str(), strlen(norm_db.c_str()),
+                                 norm_table.c_str(), strlen(norm_table.c_str()),
+                                 &xpand_table_oid, table_share);
 
   return error_code;
 }
@@ -558,7 +559,9 @@ int ha_xpand::open(const char *name, int mode, uint test_if_locked)
     if ((error_code= normalize_tablename(name, &norm_db, &norm_table)))
       DBUG_RETURN(error_code);
 
-    error_code= trx->get_table_oid(norm_db, norm_table, &xpand_table_oid,
+    error_code= trx->get_table_oid(norm_db.c_str(), strlen(norm_db.c_str()),
+                                   norm_table.c_str(),
+                                   strlen(norm_table.c_str()), &xpand_table_oid,
                                    table_share);
     if (error_code)
       DBUG_RETURN(error_code);

storage/xpand/xpand_connection.cc

@@ -1022,8 +1022,8 @@ int xpand_connection::populate_table_list(LEX_CSTRING *db,
      error code if an error occurred
 */
 
-int xpand_connection::get_table_oid(const std::string &db,
-                                    const std::string &name,
+int xpand_connection::get_table_oid(const char *db, size_t db_len,
+                                    const char *name, size_t name_len,
                                     ulonglong *oid,
                                     TABLE_SHARE *share)
 {
@@ -1038,9 +1038,9 @@ int xpand_connection::get_table_oid(const std::string &db,
                  "from system.databases d "
                  "     inner join ""system.relations r on d.db = r.db "
                  "where d.name = '");
-  get_oid.append(db.c_str());
+  get_oid.append(db, db_len);
   get_oid.append("' and r.name = '");
-  get_oid.append(name.c_str());
+  get_oid.append(name, name_len);
   get_oid.append("'");
 
   if (mysql_real_query(&xpand_net, get_oid.c_ptr(), get_oid.length())) {
@@ -1094,6 +1094,12 @@ int xpand_connection::discover_table_details(LEX_CSTRING *db, LEX_CSTRING *name,
   MYSQL_RES *results_create = NULL;
   MYSQL_ROW row;
   String show;
+  ulonglong oid;
+
+  if ((error_code = xpand_connection::get_table_oid(db->str, db->length,
+                                                    name->str, name->length,
+                                                    &oid, share)))
+      goto error;
 
   /* get show create statement */
   show.append("show simple create table ");

storage/xpand/xpand_connection.h

@@ -110,8 +110,8 @@ class xpand_connection
   int scan_end(xpand_connection_cursor *scan);
 
   int populate_table_list(LEX_CSTRING *db, handlerton::discovered_list *result);
-  int get_table_oid(const std::string& db, const std::string &name,
-                    ulonglong *oid, TABLE_SHARE *share);
+  int get_table_oid(const char *db, size_t db_len, const char *name,
+                    size_t name_len, ulonglong *oid, TABLE_SHARE *share);
   int discover_table_details(LEX_CSTRING *db, LEX_CSTRING *name, THD *thd,
                              TABLE_SHARE *share);