[FEAT MERGE] GIS

2022-12-23 12:08:27 +00:00
parent 38846e73d6
commit 40d215fc5a
519 changed files with 158600 additions and 8396 deletions
--- a/src/share/config/ob_config_manager.cpp
+++ b/src/share/config/ob_config_manager.cpp
@ -227,7 +227,7 @@ int ObConfigManager::dump2file(const char* path) const
    }

    #ifdef ERRSIM
-    ret = E(EventTable::EN_WRITE_CONFIG_FILE_FAILED) OB_SUCCESS;;
+    ret = OB_E(EventTable::EN_WRITE_CONFIG_FILE_FAILED) OB_SUCCESS;;
    if (OB_FAIL(ret)) {
      ret = OB_IO_ERROR;
      LOG_WARN("ERRSIM, write config file failed", K(ret));