Merge branch 'maint-r14' into dev

Conflicts: erts/vsn.mk
SoftwareMaven · May 5, 2011 · 8e6ae6d · 8e6ae6d
2 parents aa9497c + 7050c92
commit 8e6ae6d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -30,6 +30,22 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.3.2</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Fix halfword emulator bug in <c>ets:select_delete</c> for
+	    <c>ordered_set</c> that caused emulator to crash.</p>
+          <p>
+	    Own Id: OTP-9258 Aux Id: seq11836 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.8.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
@@ -2705,7 +2705,7 @@ Sint cmp(Eterm a, Eterm b)
     while (--i) {
 	a = *aa++;
 	b = *bb++;
-	if (a != b) {
+	if (!is_same(a,a_base, b,b_base)) {
 	    if (is_atom(a) && is_atom(b)) {
 		if ((j = cmp_atoms(a, b)) != 0) {
 		    goto not_equal;