branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676.

ibuf/ibuf0ibuf.c

@@ -1338,7 +1338,7 @@ ibuf_rec_get_volume(
 		types = rec_get_nth_field_old(ibuf_rec, 1, &len);
 
 		ut_ad(len == n_fields * DATA_ORDER_NULL_TYPE_BUF_SIZE);
-		comp = FALSE;
+		comp = 0;
 	} else {
 		/* >= 4.1.x format record */
 

mysql-test/innodb.result

@@ -3306,10 +3306,3 @@ Variable_name	Value
 Handler_update	1
 Variable_name	Value
 Handler_delete	1
-CREATE TABLE t1(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
-ENGINE=InnoDB;
-INSERT INTO t1 VALUES('abc'),(0xEFBCA4EFBCA4EFBCA4);
-UPDATE t1 SET c='DDD' WHERE c=0xEFBCA4EFBCA4EFBCA4;
-UPDATE t1 SET c=NULL WHERE c='DDD';
-UPDATE t1 SET c='DDD' WHERE c IS NULL;
-DROP TABLE t1;

mysql-test/innodb.test

@@ -2526,17 +2526,6 @@ CONNECTION default;
 
 -- enable_query_log
 
-# Bug : no update-in-place of UTF-8 columns in ROW_FORMAT=REDUNDANT
-# (btr_cur_update_in_place not invoked when updating from/to NULL;
-# the update is performed by delete and insert instead)
-CREATE TABLE t1(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
-ENGINE=InnoDB;
-INSERT INTO t1 VALUES('abc'),(0xEFBCA4EFBCA4EFBCA4);
-UPDATE t1 SET c='DDD' WHERE c=0xEFBCA4EFBCA4EFBCA4;
-UPDATE t1 SET c=NULL WHERE c='DDD';
-UPDATE t1 SET c='DDD' WHERE c IS NULL;
-DROP TABLE t1;
-
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #

mysql-test/innodb_bug44032.result

+CREATE TABLE bug44032(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
+ENGINE=InnoDB;
+INSERT INTO bug44032 VALUES('abc'),(0xEFBCA4EFBCA4EFBCA4);
+UPDATE bug44032 SET c='DDD' WHERE c=0xEFBCA4EFBCA4EFBCA4;
+UPDATE bug44032 SET c=NULL WHERE c='DDD';
+UPDATE bug44032 SET c='DDD' WHERE c IS NULL;
+DROP TABLE bug44032;

mysql-test/innodb_bug44032.test

+# Bug44032 no update-in-place of UTF-8 columns in ROW_FORMAT=REDUNDANT
+# (btr_cur_update_in_place not invoked when updating from/to NULL;
+# the update is performed by delete and insert instead)
+
+-- source include/have_innodb.inc
+
+CREATE TABLE bug44032(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
+ENGINE=InnoDB;
+INSERT INTO bug44032 VALUES('abc'),(0xEFBCA4EFBCA4EFBCA4);
+UPDATE bug44032 SET c='DDD' WHERE c=0xEFBCA4EFBCA4EFBCA4;
+UPDATE bug44032 SET c=NULL WHERE c='DDD';
+UPDATE bug44032 SET c='DDD' WHERE c IS NULL;
+DROP TABLE bug44032;

rem/rem0rec.c

@@ -949,7 +949,7 @@ rec_convert_dtuple_to_rec_old(
 	ut_ad(dtuple_check_typed(dtuple));
 
 	n_fields = dtuple_get_n_fields(dtuple);
-	data_size = dtuple_get_data_size(dtuple, FALSE);
+	data_size = dtuple_get_data_size(dtuple, 0);
 
 	ut_ad(n_fields > 0);
 
@@ -982,7 +982,7 @@ rec_convert_dtuple_to_rec_old(
 
 			if (dfield_is_null(field)) {
 				len = dtype_get_sql_null_size(
-					dfield_get_type(field), FALSE);
+					dfield_get_type(field), 0);
 				data_write_sql_null(rec + end_offset, len);
 
 				end_offset += len;
@@ -1010,7 +1010,7 @@ rec_convert_dtuple_to_rec_old(
 
 			if (dfield_is_null(field)) {
 				len = dtype_get_sql_null_size(
-					dfield_get_type(field), FALSE);
+					dfield_get_type(field), 0);
 				data_write_sql_null(rec + end_offset, len);
 
 				end_offset += len;

row/row0upd.c

@@ -423,7 +423,7 @@ row_upd_changes_field_size_or_external(
 			new_len = dict_col_get_sql_null_size(
 				dict_index_get_nth_col(index,
 						       upd_field->field_no),
-				FALSE);
+				0);
 		}
 
 		old_len = rec_offs_nth_size(offsets, upd_field->field_no);