hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix master mysqltest

Browse Source
This commit is contained in:
wangt1xiuyi
2022-11-09 15:09:11 +00:00
committed by wangzelin.wzl
parent bb37fd7a3c
commit 44cebeb825
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/stat/ob_stats_estimator.cpp
View File

@ -326,7 +326,9 @@ int ObStatsEstimator::do_estimate(uint64_t tenant_id,
ctx_.get_my_session()->set_inner_session(); ctx_.get_my_session()->set_inner_session();
SMART_VAR(ObMySQLProxy::MySQLResult, proxy_result) { SMART_VAR(ObMySQLProxy::MySQLResult, proxy_result) {
sqlclient::ObMySQLResult *client_result = NULL; sqlclient::ObMySQLResult *client_result = NULL;
if (OB_FAIL(pool->acquire(ctx_.get_my_session(), conn))) { if (lib::is_oracle_mode() && OB_FAIL(pool->acquire(ctx_.get_my_session(), conn, true))) {
LOG_WARN("failed to acquire inner connection", K(ret));
} else if (lib::is_mysql_mode() && OB_FAIL(pool->acquire(tenant_id, conn, sql_proxy))) {
LOG_WARN("failed to acquire inner connection", K(ret)); LOG_WARN("failed to acquire inner connection", K(ret));
} else if (OB_ISNULL(conn)) { } else if (OB_ISNULL(conn)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;