Merge branch 'bb-10.1-serg' into 10.1

8 files changed, 44 insertions, 50 deletions

diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc
index 7a381f4ca05..712dfa264d4 100644
--- a/storage/xtradb/fts/fts0fts.cc
+++ b/storage/xtradb/fts/fts0fts.cc
@@ -6274,7 +6274,7 @@ fts_fake_hex_to_dec(
 #ifdef _WIN32
 	ret = sscanf(tmp_id, "%016llu", &dec_id);
 #else
-	ret = sscanf(tmp_id, "%016"PRIu64, &dec_id);
+	ret = sscanf(tmp_id, "%016" PRIu64, &dec_id);
 #endif /* _WIN32 */
 	ut_ad(ret == 1);
 
diff --git a/storage/xtradb/fts/fts0opt.cc b/storage/xtradb/fts/fts0opt.cc
index e096b8bf6d6..0703b050848 100644
--- a/storage/xtradb/fts/fts0opt.cc
+++ b/storage/xtradb/fts/fts0opt.cc
@@ -598,7 +598,7 @@ fts_zip_read_word(
 		/* Finished decompressing block. */
 		if (zip->zp->avail_in == 0) {
 
-			/* Free the block thats been decompressed. */
+			/* Free the block that's been decompressed. */
 			if (zip->pos > 0) {
 				ulint	prev = zip->pos - 1;
 
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index e11982de694..065f1bd2ca0 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -21123,7 +21123,7 @@ maria_declare_plugin(xtradb)
   innodb_status_variables_export,/* status variables             */
   innobase_system_variables, /* system variables */
   INNODB_VERSION_STR,         /* string version */
-  MariaDB_PLUGIN_MATURITY_BETA /* maturity */
+  MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
 },
 i_s_xtradb_read_view,
 i_s_xtradb_internal_hash_tables,
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 09e72114711..a131a50458a 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -792,7 +792,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_trx =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
@@ -1050,7 +1050,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_locks =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
@@ -1231,7 +1231,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_lock_waits =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /*******************************************************************//**
@@ -1565,7 +1565,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmp =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmp_reset =
@@ -1613,7 +1613,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmp_reset =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /* Fields of the dynamic tables
@@ -1912,7 +1912,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_cmp_per_index =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 UNIV_INTERN struct st_mysql_plugin	i_s_innodb_cmp_per_index_reset =
@@ -1961,7 +1961,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_cmp_per_index_reset =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /* Fields of the dynamic table information_schema.innodb_cmpmem. */
@@ -2203,7 +2203,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmpmem =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmpmem_reset =
@@ -2251,7 +2251,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_cmpmem_reset =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_metrics */
@@ -2774,7 +2774,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_metrics =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_ft_default_stopword */
 static ST_FIELD_INFO	i_s_stopword_fields_info[] =
@@ -2886,7 +2886,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_default_stopword =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_DELETED
@@ -3053,7 +3053,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_deleted =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /*******************************************************************//**
@@ -3135,7 +3135,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_being_deleted =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHED and
@@ -3423,7 +3423,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_index_cache =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /*******************************************************************//**
@@ -3857,7 +3857,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_index_table =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_CONFIG */
@@ -4054,7 +4054,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_ft_config =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /* Fields of the dynamic table INNODB_BUFFER_POOL_STATS. */
@@ -4601,7 +4601,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_buffer_stats =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /* Fields of the dynamic table INNODB_BUFFER_POOL_PAGE. */
@@ -5310,7 +5310,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_buffer_page =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 static ST_FIELD_INFO	i_s_innodb_buf_page_lru_fields_info[] =
@@ -5855,7 +5855,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_buffer_page_lru =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /*******************************************************************//**
@@ -6147,7 +6147,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_tables =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_TABLESTATS  ***********************************************/
@@ -6435,7 +6435,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_tablestats =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_INDEXES  **************************************************/
@@ -6685,7 +6685,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_indexes =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_COLUMNS  **************************************************/
@@ -6920,7 +6920,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_columns =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_FIELDS  ***************************************************/
@@ -7128,7 +7128,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_fields =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_FOREIGN        ********************************************/
@@ -7351,7 +7351,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_foreign =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_FOREIGN_COLS   ********************************************/
@@ -7566,7 +7566,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_sys_foreign_cols =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  SYS_TABLESPACES    ********************************************/
@@ -7833,7 +7833,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_sys_tablespaces =
 	STRUCT_FLD(system_vars, NULL),
 
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /**  SYS_DATAFILES  ************************************************/
@@ -8020,7 +8020,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_sys_datafiles =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 static ST_FIELD_INFO	i_s_innodb_changed_pages_info[] =
@@ -8389,7 +8389,7 @@ UNIV_INTERN struct st_maria_plugin   i_s_innodb_changed_pages =
 	STRUCT_FLD(version, 0x0100 /* 1.0 */),
 	STRUCT_FLD(status_vars, NULL),
 	STRUCT_FLD(system_vars, NULL),
-        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+        INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  TABLESPACES_ENCRYPTION    ********************************************/
@@ -8681,7 +8681,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_tablespaces_encryption =
 	/* struct st_mysql_sys_var** */
 	STRUCT_FLD(system_vars, NULL),
 
-	INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_BETA
+	INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_GAMMA
 };
 
 /**  TABLESPACES_SCRUBBING    ********************************************/
@@ -8980,7 +8980,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_tablespaces_scrubbing =
 
 	/* Maria extension */
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-	STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA)
+	STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA)
 };
 
 /**  INNODB_MUTEXES  *********************************************/
@@ -9194,7 +9194,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_mutexes =
 
         /* Maria extension */
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 /**  SYS_SEMAPHORE_WAITS  ************************************************/
@@ -9471,7 +9471,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_sys_semaphore_waits =
 
         /* Maria extension */
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 static ST_FIELD_INFO	innodb_changed_page_bitmaps_fields_info[] =
@@ -9595,6 +9595,6 @@ UNIV_INTERN struct st_mysql_plugin	i_s_innodb_changed_page_bitmaps =
 
         /* Maria extension */
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
diff --git a/storage/xtradb/handler/xtradb_i_s.cc b/storage/xtradb/handler/xtradb_i_s.cc
index 207682e3154..a0ff959013a 100644
--- a/storage/xtradb/handler/xtradb_i_s.cc
+++ b/storage/xtradb/handler/xtradb_i_s.cc
@@ -176,7 +176,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_xtradb_read_view =
 	STRUCT_FLD(status_vars, NULL),
 	STRUCT_FLD(system_vars, NULL),
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 static ST_FIELD_INFO xtradb_internal_hash_tables_fields_info[] =
@@ -381,7 +381,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_xtradb_internal_hash_tables =
 	STRUCT_FLD(status_vars, NULL),
 	STRUCT_FLD(system_vars, NULL),
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
 
 
@@ -514,5 +514,5 @@ UNIV_INTERN struct st_mysql_plugin	i_s_xtradb_rseg =
 	STRUCT_FLD(status_vars, NULL),
 	STRUCT_FLD(system_vars, NULL),
 	STRUCT_FLD(version_info, INNODB_VERSION_STR),
-        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA),
+        STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_GAMMA),
 };
diff --git a/storage/xtradb/include/fts0priv.ic b/storage/xtradb/include/fts0priv.ic
index 2d07c60f980..ec61691870b 100644
--- a/storage/xtradb/include/fts0priv.ic
+++ b/storage/xtradb/include/fts0priv.ic
@@ -53,7 +53,7 @@ fts_write_object_id(
 	/* Use this to construct old(5.6.14 and 5.7.3) windows
 	ambiguous aux table names */
 	DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
-			return(sprintf(str, "%016"PRIu64, id)););
+			return(sprintf(str, "%016" PRIu64, id)););
 
 	DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
 			return(sprintf(str, UINT64PFx, id)););
@@ -66,7 +66,7 @@ fts_write_object_id(
 		// FIXME: Use ut_snprintf(), so does following one.
 		return(sprintf(str, "%016llu", id));
 #else /* _WIN32 */
-		return(sprintf(str, "%016"PRIu64, id));
+		return(sprintf(str, "%016" PRIu64, id));
 #endif /* _WIN32 */
 	}
 
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc
index a8533f1bb9e..b2b3e256211 100644
--- a/storage/xtradb/os/os0file.cc
+++ b/storage/xtradb/os/os0file.cc
@@ -3148,7 +3148,7 @@ try_again:
 			"Error in system call pread(). The operating"
 			" system error number is %lu.",(ulint) errno);
         } else {
-		/* Partial read occured */
+		/* Partial read occurred */
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Tried to read " ULINTPF " bytes at offset "
 			UINT64PF ". Was only able to read %ld.",
@@ -3252,7 +3252,7 @@ try_again:
 			"Error in system call pread(). The operating"
 			" system error number is %lu.",(ulint) errno);
         } else {
-		/* Partial read occured */
+		/* Partial read occurred */
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Tried to read " ULINTPF " bytes at offset "
 			UINT64PF ". Was only able to read %ld.",
diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc
index 35719391fae..2bebfb7a0f1 100644
--- a/storage/xtradb/row/row0sel.cc
+++ b/storage/xtradb/row/row0sel.cc
@@ -3751,12 +3751,6 @@ row_search_for_mysql(
 		ut_error;
 	}
 
-	/* init null bytes with default values as they might be
-	left uninitialized in some cases and these uninited bytes
-	might be copied into mysql record buffer that leads to
-	valgrind warnings */
-	memcpy(buf, prebuilt->default_rec, prebuilt->null_bitmap_len);
-
 #if 0
 	/* August 19, 2005 by Heikki: temporarily disable this error
 	print until the cursor lock count is done correctly.