diff options
| author | Sverker Eriksson <[email protected]> | 2012-08-23 15:23:32 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-08-23 15:23:32 +0200 |
| commit | 5b51ee7f109b4492870958d86338e216288a4a37 (patch) | |
| tree | 0c4f9cd22f143577449d616b5b0b9a318a996de9 | |
| parent | 55a885431333e263228e069c2aa7d56ec8e2b25c (diff) | |
| parent | 17a8416f2ccbcda98c5d28af2b007aaca2b333fe (diff) | |
| download | otp-5b51ee7f109b4492870958d86338e216288a4a37.tar.gz otp-5b51ee7f109b4492870958d86338e216288a4a37.tar.bz2 otp-5b51ee7f109b4492870958d86338e216288a4a37.zip | |
Merge branch 'sverk/ets-test_ms-bug/OTP-10190' into maint
* sverk/ets-test_ms-bug/OTP-10190:
Fix bug in ets:test_ms/2.
| -rw-r--r-- | erts/emulator/beam/erl_db_util.c | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index 1aa0cb4552..42907e2e84 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -1233,7 +1233,7 @@ static Eterm erts_match_set_run_ets(Process *p, Binary *mpsp, Eterm ret; ret = db_prog_match(p, mpsp, args, NULL, NULL, num_args, - ERTS_PAM_CONTIGUOUS_TUPLE | ERTS_PAM_COPY_RESULT, + ERTS_PAM_COPY_RESULT, return_flags); #if defined(HARDDEBUG) if (is_non_value(ret)) { diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 97ac433cb9..95f10b1df3 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -1026,6 +1026,8 @@ t_test_ms(Config) when is_list(Config) -> [{{'$1','$2'},[{'<','$1','$2'}],['$$']}]), ?line {ok,false} = ets:test_ms({a,b}, [{{'$1','$2'},[{'>','$1','$2'}],['$$']}]), + Tpl = {a,gb_sets:new()}, + ?line {ok,Tpl} = ets:test_ms(Tpl, [{{'_','_'}, [], ['$_']}]), % OTP-10190 ?line {error,[{error,String}]} = ets:test_ms({a,b}, [{{'$1','$2'}, [{'flurp','$1','$2'}], |