List:Commits« Previous MessageNext Message »
From:marko.makela Date:April 27 2010 1:52pm
Subject:bzr push into mysql-5.1-innodb branch (marko.makela:3423)
View as plain text  
 3423 Marko Mäkelä	2010-04-27 [merge]
      Merge

    added:
      mysql-test/suite/innodb/r/innodb_misc1.result
      mysql-test/suite/innodb/t/innodb_misc1-master.opt
      mysql-test/suite/innodb/t/innodb_misc1.test
    modified:
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/innodb.test
=== modified file 'storage/innodb_plugin/row/row0merge.c'
--- a/storage/innodb_plugin/row/row0merge.c	2010-02-24 08:56:43 +0000
+++ b/storage/innodb_plugin/row/row0merge.c	2010-04-27 13:47:38 +0000
@@ -2070,7 +2070,7 @@ row_merge_drop_temp_indexes(void)
 		field = rec_get_nth_field_old(rec, DICT_SYS_INDEXES_NAME_FIELD,
 					      &len);
 		if (len == UNIV_SQL_NULL || len == 0
-		    || mach_read_from_1(field) != (ulint) TEMP_INDEX_PREFIX) {
+		    || (char) *field != TEMP_INDEX_PREFIX) {
 			continue;
 		}
 

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100427135154-055gtf2dysgt5x0m.bundle
Thread
bzr push into mysql-5.1-innodb branch (marko.makela:3423) marko.makela27 Apr