Wrap handler::print_error()

mroonga · Aug 10, 2018 · 5a9d64f · 5a9d64f
1 parent 4eb9bac
commit 5a9d64f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -13042,6 +13042,35 @@ handler *ha_mroonga::clone(const char *name, MEM_ROOT *mem_root)
   DBUG_RETURN(cloned_handler);
 }
 
+void ha_mroonga::wrapper_print_error(int error, myf flag)
+{
+  MRN_DBUG_ENTER_METHOD();
+  MRN_SET_WRAP_SHARE_KEY(share, table->s);
+  MRN_SET_WRAP_TABLE_KEY(this, table);
+  wrap_handler->print_error(error, flag);
+  MRN_SET_BASE_SHARE_KEY(share, table->s);
+  MRN_SET_BASE_TABLE_KEY(this, table);
+  DBUG_VOID_RETURN;
+}
+
+void ha_mroonga::storage_print_error(int error, myf flag)
+{
+  MRN_DBUG_ENTER_METHOD();
+  handler::print_error(error, flag);
+  DBUG_VOID_RETURN;
+}
+
+void ha_mroonga::print_error(int error, myf flag)
+{
+  MRN_DBUG_ENTER_METHOD();
+  if (share->wrapper_mode) {
+    wrapper_print_error(error, flag);
+  } else {
+    storage_print_error(error, flag);
+  }
+  DBUG_VOID_RETURN;
+}
+
 bool ha_mroonga::wrapper_get_error_message(int error, String *buffer)
 {
   bool errored;

diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -646,6 +646,7 @@ class ha_mroonga: public handler
   int reset();
 
   handler *clone(const char *name, MEM_ROOT *mem_root) mrn_override;
+  void print_error(int error, myf flag) mrn_override;
   bool get_error_message(int error, String *buffer) mrn_override;
 #ifdef MRN_HANDLER_HAVE_TABLE_CACHE_TYPE
   uint8 table_cache_type();
@@ -1302,6 +1303,8 @@ class ha_mroonga: public handler
   void storage_cond_pop();
   handler *wrapper_clone(const char *name, MEM_ROOT *mem_root);
   handler *storage_clone(const char *name, MEM_ROOT *mem_root);
+  void wrapper_print_error(int error, myf flag);
+  void storage_print_error(int error, myf flag);
   bool wrapper_get_error_message(int error, String *buffer);
   bool storage_get_error_message(int error, String *buffer);
 #ifdef MRN_HANDLER_HAVE_TABLE_CACHE_TYPE