List:Commits« Previous MessageNext Message »
From:marko.makela Date:April 21 2010 9:17am
Subject:bzr push into mysql-5.1-innodb branch (marko.makela:3407 to 3408)
View as plain text  
 3408 Marko Mäkelä	2010-04-21
      rec_convert_dtuple_to_rec(): Correct the debug check.
      The "extern" accessor functions return zero or nonzero, not 0 or 1.

    modified:
      storage/innodb_plugin/rem/rem0rec.c
 3407 Marko Mäkelä	2010-04-21
      rec_convert_dtuple_to_rec(): Add a debug check.

    modified:
      storage/innodb_plugin/rem/rem0rec.c
=== modified file 'storage/innodb_plugin/rem/rem0rec.c'
--- a/storage/innodb_plugin/rem/rem0rec.c	2010-04-21 06:39:16 +0000
+++ b/storage/innodb_plugin/rem/rem0rec.c	2010-04-21 09:16:11 +0000
@@ -1225,8 +1225,8 @@ rec_convert_dtuple_to_rec(
 		      == rec_offs_n_fields(offsets));
 
 		for (i = 0; i < rec_offs_n_fields(offsets); i++) {
-			ut_ad(dfield_is_ext(dtuple_get_nth_field(dtuple, i))
-			      == rec_offs_nth_extern(offsets, i));
+			ut_ad(!dfield_is_ext(dtuple_get_nth_field(dtuple, i))
+			      == !rec_offs_nth_extern(offsets, i));
 		}
 
 		if (UNIV_LIKELY_NULL(heap)) {

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru.bundle
Thread
bzr push into mysql-5.1-innodb branch (marko.makela:3407 to 3408) marko.makela21 Apr