Merge from mysql-5.1-innodb:

  ------------------------------------------------------------
  revno: 3422
  revision-id: marko.makela@oracle.com-20100427134738-1poi5n4hn29ndne5
  parent: marko.makela@oracle.com-20100426131029-1ffja69h6n88q6bo
  committer: Marko M?kel? <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Tue 2010-04-27 16:47:38 +0300
  message:
    row_merge_drop_temp_indexes(): Remove a bogus char-to-ulint cast.
  modified:
    storage/innodb_plugin/row/row0merge.c 1414@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Frow%2Frow0merge.c
  ------------------------------------------------------------

storage/innobase/row/row0merge.c

@@ -2094,7 +2094,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;
 		}