Skip to content

Commit 8ca6269

Browse files
Merge branch 'stable-23.10' into MCOL-5758-BLOOM-FILTER-PRE-JOIN-GSOC-2025-REDESIGNED
2 parents 2d54d55 + fc40157 commit 8ca6269

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.drone.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
311311
' --container-name ' + getContainerName("mtr") +
312312
' --distro ' + platform +
313313
' --suite-list $${MTR_SUITE_LIST}' +
314-
' --triggering-event ' + event,
314+
' --triggering-event ' + event
315+
+ if std.endsWith(result, 'ASan') then ' --run-as-extern' else '',
315316
],
316317
[if (std.member(ignoreFailureStepList, "mtr")) then "failure"]: "ignore",
317318

build/run_mtr.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ optparse.define short=c long=container-name desc="Name of the Docker container w
99
optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO
1010
optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST
1111
optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT
12+
optparse.define short=E long=run-as-extern desc="Run MTR with --extern flag" variable=EXTERN default=false value=true
1213
optparse.define short=D long=download-data desc="Download and extract data from S3 for extended MTR" variable=DOWNLOAD_DATA default=false value=true
1314
optparse.define short=F long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default=false value=true
1415

@@ -20,6 +21,7 @@ fi
2021

2122
if [[ $FULL_MTR = true ]]; then
2223
DOWNLOAD_DATA=true
24+
EXTERN=true
2325
fi
2426

2527
MTR_FULL_SET="basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly"
@@ -82,7 +84,7 @@ fi
8284

8385
EXTERN_FLAG=""
8486

85-
if [[ $FULL_MTR = true ]]; then
87+
if [[ $EXTERN = true ]]; then
8688
EXTERN_FLAG="--extern socket=${SOCKET_PATH}"
8789
fi
8890

dbcon/mysql/ha_mcs_impl.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,15 +1348,14 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi, const std::vector<COND*>& c
13481348

13491349
// Save the item list
13501350
List<Item> items;
1351-
SELECT_LEX select_lex;
13521351

13531352
if (ha_mcs_common::isUpdateStatement(thd->lex->sql_command))
13541353
{
13551354
items = (thd->lex->first_select_lex()->item_list);
13561355
thd->lex->first_select_lex()->item_list = thd->lex->value_list;
13571356
}
13581357

1359-
select_lex = *lex->first_select_lex();
1358+
SELECT_LEX* select_lex = lex->first_select_lex();
13601359

13611360
//@Bug 2808 Error out on order by or limit clause
13621361
//@bug5096. support dml limit.
@@ -1412,7 +1411,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi, const std::vector<COND*>& c
14121411

14131412
gwi.clauseType = WHERE;
14141413

1415-
if (getSelectPlan(gwi, select_lex, updateCP, false, false, false, condStack) !=
1414+
if (getSelectPlan(gwi, *select_lex, updateCP, false, false, false, condStack) !=
14161415
0) //@Bug 3030 Modify the error message for unsupported functions
14171416
{
14181417
if (gwi.cs_vtable_is_update_with_derive)

dbcon/mysql/ha_view.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ class View
5454
uint32_t processJoin(gp_walk_info& gwi, std::stack<execplan::ParseTree*>&);
5555

5656
private:
57-
SELECT_LEX fSelect;
57+
// Lifetime of fSelect is managed by MDB and must be longer than View object
58+
SELECT_LEX& fSelect;
5859
gp_walk_info* fParentGwip;
5960
execplan::CalpontSystemCatalog::TableAliasName fViewName;
6061
};

0 commit comments

Comments
 (0)