Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/usr/home/pem/bug13510/mysql-5.0

Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/bug13510/mysql-5.0
8d9c66a5 · unknown · 60534415 · 556fdfbd · 8d9c66a5
Commit 8d9c66a5 authored Oct 12, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/ha_innodb.cc sql/ha_innodb.cc +1 -2

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -7042,8 +7042,7 @@ ha_innobase::cmp_ref(
 						    (const char*)ref1, len1,
 			                            (const char*)ref2, len2);
 		} else {
-			result = field->key_cmp((const char*)ref1,
+			result = field->key_cmp(ref1, ref2);
-					    (const char*)ref2);
 		}
 		if (result) {