aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-08-03 09:49:24 +0200
committerLukas Larsson <[email protected]>2018-08-03 09:49:24 +0200
commit0ae934aa008f9ff2a929eafc52811fcde619631a (patch)
tree938462b708ac6442bb0dda7b99815505503a4d2a /erts/emulator/beam/erl_db.c
parentc33d4c7539a1681cfbc024d8637e204c0a05fd1a (diff)
parentd383549b6e9d9b5e06f23226a61564264204db51 (diff)
downloadotp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.gz
otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.bz2
otp-0ae934aa008f9ff2a929eafc52811fcde619631a.zip
Merge branch 'lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038' into maint
* lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038: erts: Fix seq_trace to not clear token for system messages
Diffstat (limited to 'erts/emulator/beam/erl_db.c')
-rw-r--r--erts/emulator/beam/erl_db.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 36d83d93f4..c009a3bde8 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -3647,6 +3647,7 @@ send_ets_transfer_message(Process *c_p, Process *proc,
hd_copy = copy_struct(heir_data, hd_sz, &hp, ohp);
sender = c_p->common.id;
msg = TUPLE4(hp, am_ETS_TRANSFER, tid, sender, hd_copy);
+ ERL_MESSAGE_TOKEN(mp) = am_undefined;
erts_queue_proc_message(c_p, proc, *locks, mp, msg);
}