Commit 304d4f58 authored by pem@mysql.com's avatar pem@mysql.com
Browse files

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

into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
parents 171f8394 6266243d

sql/ha_innodb.cc

+1 −2
Original line number Diff line number Diff line
@@ -7042,8 +7042,7 @@ ha_innobase::cmp_ref( 
						    (const char*)ref1, len1,

			                            (const char*)ref2, len2);

		} else {

			result = field->key_cmp((const char*)ref1,

					    (const char*)ref2);

			result = field->key_cmp(ref1, ref2);

		}



		if (result) {