Bug #23329353 - Replace ut_snprint with the C++11 snprintf function.

storage/innobase/api/api0api.cc

@@ -3936,7 +3936,7 @@ ib_memc_sdi_get_keys(
 	for (dd::sdi_container::iterator it =
 		ib_vector.sdi_vector->m_vec.begin();
 		it != ib_vector.sdi_vector->m_vec.end(); it++) {
-		bytes_printed = ut_snprintf(
+		bytes_printed = snprintf(
 			ptr,
 			list_buf_len - cur_len,
 			"%llu:%u|", it->id, it->type);

storage/innobase/buf/buf0dump.cc

@@ -210,7 +210,7 @@ buf_dump_generate_path(
 {
 	char	buf[FN_REFLEN];
 
-	ut_snprintf(buf, sizeof(buf), "%s%c%s", get_buf_dump_dir(),
+	snprintf(buf, sizeof(buf), "%s%c%s", get_buf_dump_dir(),
 		    OS_PATH_SEPARATOR, srv_buf_dump_filename);
 
 	os_file_type_t	type;
@@ -237,11 +237,11 @@ buf_dump_generate_path(
 		if (srv_data_home_full[strlen(srv_data_home_full) - 1]
 		    == OS_PATH_SEPARATOR) {
 
-			ut_snprintf(path, path_size, "%s%s",
+			snprintf(path, path_size, "%s%s",
 				    srv_data_home_full,
 				    srv_buf_dump_filename);
 		} else {
-			ut_snprintf(path, path_size, "%s%c%s",
+			snprintf(path, path_size, "%s%c%s",
 				    srv_data_home_full,
 				    OS_PATH_SEPARATOR,
 				    srv_buf_dump_filename);
@@ -271,7 +271,7 @@ buf_dump(
 
 	buf_dump_generate_path(full_filename, sizeof(full_filename));
 
-	ut_snprintf(tmp_filename, sizeof(tmp_filename),
+	snprintf(tmp_filename, sizeof(tmp_filename),
 		    "%s.incomplete", full_filename);
 
 	buf_dump_status(STATUS_INFO, "Dumping buffer pool(s) to %s",

storage/innobase/dict/dict0crea.cc

@@ -2531,7 +2531,7 @@ dict_sdi_create_idx_in_mem(
 	digits of copy_num (10) + 1 */
 	char		table_name[28];
 	mem_heap_t*	heap = mem_heap_create(DICT_HEAP_SIZE);
-	ut_snprintf(table_name, sizeof(table_name), "SDI_" ULINTPF "_" UINT32PF,
+	snprintf(table_name, sizeof(table_name), "SDI_" ULINTPF "_" UINT32PF,
 		    space, copy_num);
 
 	dict_table_t*	table = dict_mem_table_create(
@@ -2556,7 +2556,7 @@ dict_sdi_create_idx_in_mem(
 
 	/* 16 =	14(CLUST_IND_SDI_) + 1 (copy_num 0 or 1) + 1 */
 	char	index_name[16];
-	ut_snprintf(index_name, sizeof(index_name), "CLUST_IND_SDI_" UINT32PF,
+	snprintf(index_name, sizeof(index_name), "CLUST_IND_SDI_" UINT32PF,
 		    copy_num);
 
 	dict_index_t*	temp_index = dict_mem_index_create(

storage/innobase/dict/dict0dict.cc

@@ -6455,7 +6455,7 @@ dict_table_schema_check(
 	if (table == NULL) {
 		/* no such table */
 
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Table %s not found.",
 			    ut_format_name(req_schema->table_name,
 					   buf, sizeof(buf)));
@@ -6466,7 +6466,7 @@ dict_table_schema_check(
 	if (table->ibd_file_missing) {
 		/* missing tablespace */
 
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Tablespace for table %s is missing.",
 			    ut_format_name(req_schema->table_name,
 					   buf, sizeof(buf)));
@@ -6477,7 +6477,7 @@ dict_table_schema_check(
 	ulint n_sys_cols = dict_table_get_n_sys_cols(table);
 	if ((ulint) table->n_def - n_sys_cols != req_schema->n_cols) {
 		/* the table has a different number of columns than required */
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "%s has %lu columns but should have %lu.",
 			    ut_format_name(req_schema->table_name,
 					   buf, sizeof(buf)),
@@ -6498,7 +6498,7 @@ dict_table_schema_check(
 
 		if (j == table->n_def) {
 
-			ut_snprintf(errstr, errstr_sz,
+			snprintf(errstr, errstr_sz,
 				    "required column %s"
 				    " not found in table %s.",
 				    req_schema->columns[i].name,
@@ -6517,7 +6517,7 @@ dict_table_schema_check(
 
 			CREATE_TYPES_NAMES();
 
-			ut_snprintf(errstr, errstr_sz,
+			snprintf(errstr, errstr_sz,
 				    "Column %s in table %s is %s"
 				    " but should be %s (length mismatch).",
 				    req_schema->columns[i].name,
@@ -6533,7 +6533,7 @@ dict_table_schema_check(
 
 			CREATE_TYPES_NAMES();
 
-			ut_snprintf(errstr, errstr_sz,
+			snprintf(errstr, errstr_sz,
 				    "Column %s in table %s is %s"
 				    " but should be %s (type mismatch).",
 				    req_schema->columns[i].name,
@@ -6552,7 +6552,7 @@ dict_table_schema_check(
 
 			CREATE_TYPES_NAMES();
 
-			ut_snprintf(errstr, errstr_sz,
+			snprintf(errstr, errstr_sz,
 				    "Column %s in table %s is %s"
 				    " but should be %s (flags mismatch).",
 				    req_schema->columns[i].name,
@@ -6565,7 +6565,7 @@ dict_table_schema_check(
 	}
 
 	if (req_schema->n_foreign != table->foreign_set.size()) {
-		ut_snprintf(
+		snprintf(
 			errstr, errstr_sz,
 			"Table %s has " ULINTPF " foreign key(s) pointing"
 			" to other tables, but it must have %lu.",
@@ -6577,7 +6577,7 @@ dict_table_schema_check(
 	}
 
 	if (req_schema->n_referenced != table->referenced_set.size()) {
-		ut_snprintf(
+		snprintf(
 			errstr, errstr_sz,
 			"There are " ULINTPF " foreign key(s) pointing to %s, "
 			"but there must be %lu.",
@@ -6653,7 +6653,7 @@ dict_fs2utf8(
 		&errors);
 
 	if (errors != 0) {
-		ut_snprintf(table_utf8, table_utf8_size, "%s", table);
+		snprintf(table_utf8, table_utf8_size, "%s", table);
 	}
 }
 

storage/innobase/dict/dict0mem.cc

@@ -694,7 +694,7 @@ dict_mem_create_temporary_tablename(
 	size = dblen + (sizeof(TEMP_FILE_PREFIX) + 3 + 20 + 1 + 10);
 	name = static_cast<char*>(mem_heap_alloc(heap, size));
 	memcpy(name, dbtab, dblen);
-	ut_snprintf(name + dblen, size - dblen,
+	snprintf(name + dblen, size - dblen,
 		    TEMP_FILE_PREFIX_INNODB UINT64PF "-" UINT32PF,
 		    id, dict_temp_file_num);
 

storage/innobase/dict/dict0stats.cc

@@ -2365,19 +2365,19 @@ dict_stats_save(
 			char	stat_description[1024];
 			ulint	j;
 
-			ut_snprintf(stat_name, sizeof(stat_name),
+			snprintf(stat_name, sizeof(stat_name),
 				    "n_diff_pfx%02lu", i + 1);
 
 			/* craft a string that contains the column names */
-			ut_snprintf(stat_description,
+			snprintf(stat_description,
 				    sizeof(stat_description),
 				    "%s", index->fields[0].name());
 			for (j = 1; j <= i; j++) {
 				size_t	len;
 
 				len = strlen(stat_description);
 
-				ut_snprintf(stat_description + len,
+				snprintf(stat_description + len,
 					    sizeof(stat_description) - len,
 					    ",%s", index->fields[j].name());
 			}
@@ -3155,7 +3155,7 @@ dict_stats_drop_index(
 	}
 
 	if (ret != DB_SUCCESS) {
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Unable to delete statistics for index %s"
 			    " from %s%s: %s. They can be deleted later using"
 			    " DELETE FROM %s WHERE"
@@ -3301,7 +3301,7 @@ dict_stats_drop_table(
 
 	if (ret != DB_SUCCESS) {
 
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Unable to delete statistics for table %s.%s: %s."
 			    " They can be deleted later using"
 
@@ -3484,7 +3484,7 @@ dict_stats_rename_table(
 		 && n_attempts < 5);
 
 	if (ret != DB_SUCCESS) {
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Unable to rename statistics from"
 			    " %s.%s to %s.%s in %s: %s."
 			    " They can be renamed later using"
@@ -3543,7 +3543,7 @@ dict_stats_rename_table(
 	rw_lock_x_unlock(dict_operation_lock);
 
 	if (ret != DB_SUCCESS) {
-		ut_snprintf(errstr, errstr_sz,
+		snprintf(errstr, errstr_sz,
 			    "Unable to rename statistics from"
 			    " %s.%s to %s.%s in %s: %s."
 			    " They can be renamed later using"

storage/innobase/fts/fts0config.cc

@@ -348,7 +348,7 @@ fts_config_set_index_ulint(
 	// FIXME: Get rid of snprintf
 	ut_a(FTS_MAX_INT_LEN < FTS_MAX_CONFIG_VALUE_LEN);
 
-	value.f_len = ut_snprintf(
+	value.f_len = snprintf(
 		(char*) value.f_str, FTS_MAX_INT_LEN, "%lu", int_value);
 
 	error = fts_config_set_index_value(trx, index, name, &value);

storage/innobase/fts/fts0fts.cc

@@ -2811,7 +2811,7 @@ fts_update_sync_doc_id(
 
 	info = pars_info_create();
 
-	id_len = ut_snprintf(
+	id_len = snprintf(
 		(char*) id, sizeof(id), FTS_DOC_ID_FORMAT, doc_id + 1);
 
 	pars_info_bind_varchar_literal(info, "doc_id", id, id_len);

storage/innobase/handler/ha_innodb.cc

@@ -10281,12 +10281,12 @@ create_table_info_t::create_table_def()
 
 		if (dict_table_is_intrinsic(table) && field->orig_table) {
 
-			ut_snprintf(field_name, sizeof(field_name),
+			snprintf(field_name, sizeof(field_name),
 				    "%s_%s_%lu", field->orig_table->alias,
 				    field->field_name, i);
 
 		} else {
-			ut_snprintf(field_name, sizeof(field_name),
+			snprintf(field_name, sizeof(field_name),
 				    "%s", field->field_name);
 		}
 
@@ -16598,13 +16598,13 @@ ShowStatus::to_string(
 		int	name_len;
 		char	name_buf[IO_SIZE];
 
-		name_len = ut_snprintf(
+		name_len = snprintf(
 			name_buf, sizeof(name_buf), "%s", it->m_name.c_str());
 
 		int	status_len;
 		char	status_buf[IO_SIZE];
 
-		status_len = ut_snprintf(
+		status_len = snprintf(
 			status_buf, sizeof(status_buf),
 			"spins=%lu,waits=%lu,calls=" TRX_ID_FMT,
 			static_cast<ulong>(it->m_spins),
@@ -16691,15 +16691,15 @@ innodb_show_rwlock_status(
 			continue;
 		}
 
-		buf1len = ut_snprintf(
+		buf1len = snprintf(
 			buf1, sizeof buf1, "rwlock: %s:%lu",
 			innobase_basename(rw_lock->cfile_name),
 			static_cast<ulong>(rw_lock->cline));
 
 		int		buf2len;
 		char		buf2[IO_SIZE];
 
-		buf2len = ut_snprintf(
+		buf2len = snprintf(
 			buf2, sizeof buf2, "waits=%lu",
 			static_cast<ulong>(rw_lock->count_os_wait));
 
@@ -16719,15 +16719,15 @@ innodb_show_rwlock_status(
 		int		buf1len;
 		char		buf1[IO_SIZE];
 
-		buf1len = ut_snprintf(
+		buf1len = snprintf(
 			buf1, sizeof buf1, "sum rwlock: %s:%lu",
 			innobase_basename(block_rwlock->cfile_name),
 			static_cast<ulong>(block_rwlock->cline));
 
 		int		buf2len;
 		char		buf2[IO_SIZE];
 
-		buf2len = ut_snprintf(
+		buf2len = snprintf(
 			buf2, sizeof buf2, "waits=%lu",
 			static_cast<ulong>(block_rwlock_oswait_count));
 
@@ -17362,7 +17362,7 @@ ha_innobase::get_foreign_dup_key(
 	child_table_name[len] = '\0';
 
 	/* copy index name */
-	ut_snprintf(child_key_name, child_key_name_len, "%s",
+	snprintf(child_key_name, child_key_name_len, "%s",
 		    err_index->name());
 
 	return(true);
@@ -17948,7 +17948,7 @@ innodb_buffer_pool_size_update(
 {
 	longlong	in_val = *static_cast<const longlong*>(save);
 
-	ut_snprintf(export_vars.innodb_buffer_pool_resize_status,
+	snprintf(export_vars.innodb_buffer_pool_resize_status,
 	        sizeof(export_vars.innodb_buffer_pool_resize_status),
 		"Requested to resize buffer pool.");
 

storage/innobase/handler/handler0alter.cc

@@ -8096,7 +8096,7 @@ alter_stats_rebuild(
 # define DBUG_INJECT_CRASH(prefix, count)			\
 do {								\
 	char buf[32];						\
-	ut_snprintf(buf, sizeof buf, prefix "_%u", count);	\
+	snprintf(buf, sizeof buf, prefix "_%u", count);	\
 	DBUG_EXECUTE_IF(buf, DBUG_SUICIDE(););			\
 } while (0)
 #else
@@ -8338,7 +8338,7 @@ ha_innobase::commit_inplace_alter_table(
 			/* Generate a dynamic dbug text. */
 			char buf[32];
 
-			ut_snprintf(buf, sizeof buf,
+			snprintf(buf, sizeof buf,
 				    "ib_commit_inplace_fail_%u",
 				    failure_inject_count++);
 

storage/innobase/handler/i_s.cc

@@ -604,7 +604,7 @@ fill_innodb_trx_from_cache(
 				cache, I_S_INNODB_TRX, i);
 
 		/* trx_id */
-		ut_snprintf(trx_id, sizeof(trx_id), TRX_ID_FMT, row->trx_id);
+		snprintf(trx_id, sizeof(trx_id), TRX_ID_FMT, row->trx_id);
 		OK(field_store_string(fields[IDX_TRX_ID], trx_id));
 
 		/* trx_state */
@@ -941,7 +941,7 @@ fill_innodb_locks_from_cache(
 				      lock_id));
 
 		/* lock_trx_id */
-		ut_snprintf(lock_trx_id, sizeof(lock_trx_id),
+		snprintf(lock_trx_id, sizeof(lock_trx_id),
 			    TRX_ID_FMT, row->lock_trx_id);
 		OK(field_store_string(fields[IDX_LOCK_TRX_ID], lock_trx_id));
 
@@ -1146,7 +1146,7 @@ fill_innodb_lock_waits_from_cache(
 				cache, I_S_INNODB_LOCK_WAITS, i);
 
 		/* requesting_trx_id */
-		ut_snprintf(requesting_trx_id, sizeof(requesting_trx_id),
+		snprintf(requesting_trx_id, sizeof(requesting_trx_id),
 			    TRX_ID_FMT, row->requested_lock_row->lock_trx_id);
 		OK(field_store_string(fields[IDX_REQUESTING_TRX_ID],
 				      requesting_trx_id));
@@ -1160,7 +1160,7 @@ fill_innodb_lock_waits_from_cache(
 				   sizeof(requested_lock_id))));
 
 		/* blocking_trx_id */
-		ut_snprintf(blocking_trx_id, sizeof(blocking_trx_id),
+		snprintf(blocking_trx_id, sizeof(blocking_trx_id),
 			    TRX_ID_FMT, row->blocking_lock_row->lock_trx_id);
 		OK(field_store_string(fields[IDX_BLOCKING_TRX_ID],
 				      blocking_trx_id));
@@ -1773,7 +1773,7 @@ i_s_cmp_per_index_fill_low(
 					       index->name);
 		} else {
 			/* index not found */
-			ut_snprintf(name, sizeof(name),
+			snprintf(name, sizeof(name),
 				    "index_id:" IB_ID_FMT,
 				    iter->first.m_index_id);
 			field_store_string(fields[IDX_DATABASE_NAME],
@@ -8858,7 +8858,7 @@ i_s_files_table_fill(
 			the user must match the space_id to i_s_table.space
 			in order find the single table that is in it or the
 			schema it belongs to. */
-			ut_snprintf(
+			snprintf(
 				file_per_table_name,
 				sizeof(file_per_table_name),
 				"innodb_file_per_table_" ULINTPF,