Permalink
Browse files

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.
  • Loading branch information...
2 parents 55a8854 + 17a8416 commit 5b51ee7f109b4492870958d86338e216288a4a37 @sverker sverker committed Aug 23, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −1 erts/emulator/beam/erl_db_util.c
  2. +2 −0 lib/stdlib/test/ets_SUITE.erl
View
2 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)) {
View
2 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'}],

0 comments on commit 5b51ee7

Please sign in to comment.