Skip to content

M
mariadb
Commit 917941e4 authored by marko's avatar marko
Browse files
Options

Split lines before an opening parenthesis, not after one. 

Replace some printf(...) in debug builds with fprintf(stderr, ...).
parent 8f18616e
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 137 deletions
btr/btr0btr.c
View file @ 917941e4
......@@ -786,8 +786,8 @@ leaf_loop:
/* NOTE: page hash indexes are dropped when a page is freed inside
fsp0fsp. */
finished = fseg_free_step(
root + PAGE_HEADER + PAGE_BTR_SEG_LEAF, &mtr);
finished = fseg_free_step
(root + PAGE_HEADER + PAGE_BTR_SEG_LEAF, &mtr);
mtr_commit(&mtr);
if (!finished) {
......@@ -799,8 +799,8 @@ top_loop:
root = btr_page_get(space, root_page_no, RW_X_LATCH, &mtr);
finished = fseg_free_step_not_header(
root + PAGE_HEADER + PAGE_BTR_SEG_TOP, &mtr);
finished = fseg_free_step_not_header
(root + PAGE_HEADER + PAGE_BTR_SEG_TOP, &mtr);
mtr_commit(&mtr);
if (!finished) {
......@@ -827,8 +827,8 @@ btr_free_root(
btr_search_drop_page_hash_index(root);
top_loop:
finished = fseg_free_step(
root + PAGE_HEADER + PAGE_BTR_SEG_TOP, mtr);
finished = fseg_free_step
(root + PAGE_HEADER + PAGE_BTR_SEG_TOP, mtr);
if (!finished) {
goto top_loop;
......@@ -1979,8 +1979,8 @@ btr_lift_page_up(
ut_ad(btr_page_get_next(page, mtr) == FIL_NULL);
ut_ad(mtr_memo_contains(mtr, buf_block_align(page),
MTR_MEMO_PAGE_X_FIX));
father_page = buf_frame_align(
btr_page_get_father_node_ptr(tree, page, mtr));
father_page = buf_frame_align
(btr_page_get_father_node_ptr(tree, page, mtr));
page_level = btr_page_get_level(page, mtr);
index = tree->tree_index;
......
buf/buf0buf.c
View file @ 917941e4
......@@ -1933,8 +1933,7 @@ buf_page_io_complete(
"InnoDB: file read of page %lu.\n",
(ulong) block->offset);
fputs(
"InnoDB: You may have to recover"
fputs("InnoDB: You may have to recover"
" from a backup.\n", stderr);
buf_page_print(block->frame);
......@@ -1944,11 +1943,9 @@ buf_page_io_complete(
" or a failed\n"
"InnoDB: file read of page %lu.\n",
(ulong) block->offset);
fputs(
"InnoDB: You may have to recover"
fputs("InnoDB: You may have to recover"
" from a backup.\n", stderr);
fputs(
"InnoDB: It is also possible that"
fputs("InnoDB: It is also possible that"
" your operating\n"
"InnoDB: system has corrupted its"
" own file cache\n"
......@@ -1970,8 +1967,7 @@ buf_page_io_complete(
"InnoDB: about forcing recovery.\n", stderr);
if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {
fputs(
"InnoDB: Ending processing because of"
fputs("InnoDB: Ending processing because of"
" a corrupt database page.\n",
stderr);
exit(1);
......
buf/buf0flu.c
View file @ 917941e4
......@@ -55,8 +55,7 @@ buf_flush_insert_into_flush_list(
ut_a(block->state == BUF_BLOCK_FILE_PAGE);
ut_ad((UT_LIST_GET_FIRST(buf_pool->flush_list) == NULL)
|| (ut_dulint_cmp(
(UT_LIST_GET_FIRST(buf_pool->flush_list))
|| (ut_dulint_cmp((UT_LIST_GET_FIRST(buf_pool->flush_list))
->oldest_modification,
block->oldest_modification) <= 0));
......@@ -513,8 +512,7 @@ buf_flush_write_block_low(
#ifdef UNIV_LOG_DEBUG
if (!univ_log_debug_warned) {
univ_log_debug_warned = TRUE;
fputs(
"Warning: cannot force log to disk if"
fputs("Warning: cannot force log to disk if"
" UNIV_LOG_DEBUG is defined!\n"
"Crash recovery will not work!\n",
stderr);
......
buf/buf0lru.c
View file @ 917941e4
......@@ -103,10 +103,10 @@ scan_again:
if (block->space == id) {
#ifdef UNIV_DEBUG
if (buf_debug_prints) {
printf(
"Dropping space %lu page %lu\n",
(ulong) block->space,
(ulong) block->offset);
fprintf(stderr,
"Dropping space %lu page %lu\n",
(ulong) block->space,
(ulong) block->offset);
}
#endif
if (block->is_hashed) {
......
dict/dict0dict.c
View file @ 917941e4
......@@ -3632,8 +3632,7 @@ loop:
mutex_enter(&dict_foreign_err_mutex);
rewind(ef);
ut_print_timestamp(ef);
fputs(
" Error in dropping of a foreign key constraint"
fputs(" Error in dropping of a foreign key constraint"
" of table ", ef);
ut_print_name(ef, NULL, TRUE, table->name);
fputs(",\n"
......
fil/fil0fil.c
View file @ 917941e4
......@@ -1982,8 +1982,7 @@ stop_ibuf_merges:
} else {
if (count > 5000) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Warning: trying to"
fputs(" InnoDB: Warning: trying to"
" delete tablespace ", stderr);
ut_print_filename(stderr, space->name);
fprintf(stderr, ",\n"
......@@ -2419,8 +2418,7 @@ fil_create_new_single_table_tablespace(
err = os_file_get_last_error(TRUE);
if (err == OS_FILE_ALREADY_EXISTS) {
fputs(
"InnoDB: The file already exists though"
fputs("InnoDB: The file already exists though"
" the corresponding table did not\n"
"InnoDB: exist in the InnoDB data dictionary."
" Have you moved InnoDB\n"
......@@ -2503,8 +2501,7 @@ error_exit2:
ut_free(buf2);
if (!ret) {
fputs(
"InnoDB: Error: could not write the first page"
fputs("InnoDB: Error: could not write the first page"
" to tablespace ", stderr);
ut_print_filename(stderr, path);
putc('\n', stderr);
......@@ -2514,8 +2511,7 @@ error_exit2:
ret = os_file_flush(file);
if (!ret) {
fputs(
"InnoDB: Error: file flush of tablespace ", stderr);
fputs("InnoDB: Error: file flush of tablespace ", stderr);
ut_print_filename(stderr, path);
fputs(" failed\n", stderr);
goto error_exit;
......@@ -2592,8 +2588,7 @@ fil_reset_too_high_lsns(
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: trying to open a table,"
fputs(" InnoDB: Error: trying to open a table,"
" but could not\n"
"InnoDB: open the tablespace file ", stderr);
ut_print_filename(stderr, filepath);
......@@ -2748,8 +2743,7 @@ fil_open_single_table_tablespace(
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: trying to open a table,"
fputs(" InnoDB: Error: trying to open a table,"
" but could not\n"
"InnoDB: open the tablespace file ", stderr);
ut_print_filename(stderr, filepath);
......@@ -2794,8 +2788,7 @@ fil_open_single_table_tablespace(
if (space_id != id) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: tablespace id in file ", stderr);
fputs(" InnoDB: Error: tablespace id in file ", stderr);
ut_print_filename(stderr, filepath);
fprintf(stderr, " is %lu, but in the InnoDB\n"
"InnoDB: data dictionary it is %lu.\n"
......@@ -3259,8 +3252,7 @@ next_file_item:
}
if (0 != os_file_closedir(dbdir)) {
fputs(
"InnoDB: Warning: could not"
fputs("InnoDB: Warning: could not"
" close database directory ", stderr);
ut_print_filename(stderr, dbpath);
putc('\n', stderr);
......@@ -3495,8 +3487,7 @@ fil_space_for_table_exists_in_mem(
(ulong) namespace->id);
}
error_exit:
fputs(
"InnoDB: Please refer to\n"
fputs("InnoDB: Please refer to\n"
"InnoDB: http://dev.mysql.com/doc/refman/5.1/en/"
"innodb-troubleshooting.html\n"
"InnoDB: for how to resolve the issue.\n", stderr);
......
fsp/fsp0fsp.c
View file @ 917941e4
......@@ -364,8 +364,7 @@ xdes_get_bit(
byte_index = index / 8;
bit_index = index % 8;
return(ut_bit_get_nth(
mtr_read_ulint(descr + XDES_BITMAP + byte_index,
return(ut_bit_get_nth(mtr_read_ulint(descr + XDES_BITMAP + byte_index,
MLOG_1BYTE, mtr),
bit_index));
}
......@@ -3008,8 +3007,7 @@ fseg_free_page_low(
" InnoDB tables and recreate the whole\n"
"InnoDB: database!\n", (ulong) page);
crash:
fputs(
"InnoDB: Please refer to\n"
fputs("InnoDB: Please refer to\n"
"InnoDB: http://dev.mysql.com/doc/refman/5.1/en/"
"forcing-recovery.html\n"
"InnoDB: about forcing recovery.\n", stderr);
......@@ -3152,8 +3150,7 @@ fseg_free_extent(
descr = xdes_get_descriptor(space, page, mtr);
ut_a(xdes_get_state(descr, mtr) == XDES_FSEG);
ut_a(0 == ut_dulint_cmp(
mtr_read_dulint(descr + XDES_ID, mtr),
ut_a(0 == ut_dulint_cmp(mtr_read_dulint(descr + XDES_ID, mtr),
mtr_read_dulint(seg_inode + FSEG_ID, mtr)));
first_page_in_extent = page - (page % FSP_EXTENT_SIZE);
......
ibuf/ibuf0ibuf.c
View file @ 917941e4
......@@ -2710,10 +2710,10 @@ ibuf_insert_low(
function_exit:
#ifdef UNIV_IBUF_DEBUG
if (err == DB_SUCCESS) {
printf(
"Incrementing ibuf count of space %lu page %lu\n"
"from %lu by 1\n", space, page_no,
ibuf_count_get(space, page_no));
fprintf(stderr,
"Incrementing ibuf count of space %lu page %lu\n"
"from %lu by 1\n", space, page_no,
ibuf_count_get(space, page_no));
ibuf_count_set(space, page_no,
ibuf_count_get(space, page_no) + 1);
......@@ -2840,8 +2840,7 @@ ibuf_insert_to_index_page(
if (UNIV_UNLIKELY(rec_get_n_fields(rec, index)
!= dtuple_get_n_fields(entry))) {
fputs(
"InnoDB: Trying to insert a record from"
fputs("InnoDB: Trying to insert a record from"
" the insert buffer to an index page\n"
"InnoDB: but the number of fields does not match!\n",
stderr);
......
include/page0page.ic
View file @ 917941e4
......@@ -291,8 +291,7 @@ page_rec_is_user_rec(
/* out: TRUE if a user record */
const rec_t* rec) /* in: record */
{
return(page_rec_is_user_rec_low(
ut_align_offset(rec, UNIV_PAGE_SIZE)));
return(page_rec_is_user_rec_low(ut_align_offset(rec, UNIV_PAGE_SIZE)));
}
/****************************************************************
......@@ -304,8 +303,7 @@ page_rec_is_supremum(
/* out: TRUE if the supremum record */
const rec_t* rec) /* in: record */
{
return(page_rec_is_supremum_low(
ut_align_offset(rec, UNIV_PAGE_SIZE)));
return(page_rec_is_supremum_low(ut_align_offset(rec, UNIV_PAGE_SIZE)));
}
/****************************************************************
......@@ -317,8 +315,7 @@ page_rec_is_infimum(
/* out: TRUE if the infimum record */
const rec_t* rec) /* in: record */
{
return(page_rec_is_infimum_low(
ut_align_offset(rec, UNIV_PAGE_SIZE)));
return(page_rec_is_infimum_low(ut_align_offset(rec, UNIV_PAGE_SIZE)));
}
/*****************************************************************
......
lock/lock0lock.c
View file @ 917941e4
......@@ -1860,8 +1860,7 @@ lock_rec_enqueue_waiting(
if (trx->dict_operation) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: a record lock wait happens"
fputs(" InnoDB: Error: a record lock wait happens"
" in a dictionary operation!\n"
"InnoDB: Table name ", stderr);
ut_print_name(stderr, trx, TRUE, index->table_name);
......@@ -3364,8 +3363,7 @@ lock_deadlock_recursive(
trx_print(ef, wait_lock->trx, 3000);
fputs(
"*** (1) WAITING FOR THIS LOCK"
fputs("*** (1) WAITING FOR THIS LOCK"
" TO BE GRANTED:\n", ef);
if (lock_get_type(wait_lock) == LOCK_REC) {
......@@ -3386,8 +3384,7 @@ lock_deadlock_recursive(
lock_table_print(ef, lock);
}
fputs(
"*** (2) WAITING FOR THIS LOCK"
fputs("*** (2) WAITING FOR THIS LOCK"
" TO BE GRANTED:\n", ef);
if (lock_get_type(start->wait_lock)
......@@ -3572,8 +3569,7 @@ lock_table_enqueue_waiting(
if (trx->dict_operation) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: a table lock wait happens"
fputs(" InnoDB: Error: a table lock wait happens"
" in a dictionary operation!\n"
"InnoDB: Table name ", stderr);
ut_print_name(stderr, trx, TRUE, table->name);
......@@ -4284,16 +4280,14 @@ lock_print_info_summary(
lock_mutex_enter_kernel();
if (lock_deadlock_found) {
fputs(
"------------------------\n"
fputs("------------------------\n"
"LATEST DETECTED DEADLOCK\n"
"------------------------\n", file);
ut_copy_file(file, lock_latest_err_file);
}
fputs(
"------------\n"
fputs("------------\n"
"TRANSACTIONS\n"
"------------\n", file);
......@@ -4473,8 +4467,7 @@ loop:
nth_lock++;
if (nth_lock >= 10) {
fputs(
"10 LOCKS PRINTED FOR THIS TRX:"
fputs("10 LOCKS PRINTED FOR THIS TRX:"
" SUPPRESSING FURTHER PRINTS\n",
file);
......
log/log0log.c
View file @ 917941e4
......@@ -3131,12 +3131,11 @@ loop:
mutex_enter(&(log_sys->mutex));
if (
if (log_sys->n_pending_checkpoint_writes
#ifdef UNIV_LOG_ARCHIVE
log_sys->n_pending_archive_ios ||
|| log_sys->n_pending_archive_ios
#endif /* UNIV_LOG_ARCHIVE */
log_sys->n_pending_checkpoint_writes ||
log_sys->n_pending_writes) {
|| log_sys->n_pending_writes) {
mutex_exit(&(log_sys->mutex));
......
log/log0recv.c
View file @ 917941e4
......@@ -1534,8 +1534,7 @@ recv_apply_log_recs_for_backup(void)
page = recv_backup_application_page;
fputs(
"InnoDB: Starting an apply batch of log records"
fputs("InnoDB: Starting an apply batch of log records"
" to the database...\n"
"InnoDB: Progress in percents: ", stderr);
......@@ -1786,8 +1785,7 @@ recv_report_corrupt_log(
&& (ulint)(ptr - recv_sys->buf + 100
- recv_previous_parsed_rec_offset)
< 200000) {
fputs(
"InnoDB: Hex dump of corrupt log starting"
fputs("InnoDB: Hex dump of corrupt log starting"
" 100 bytes before the start\n"
"InnoDB: of the previous log rec,\n"
"InnoDB: and ending 100 bytes after the start"
......@@ -1802,8 +1800,7 @@ recv_report_corrupt_log(
putc('\n', stderr);
}
fputs(
"InnoDB: WARNING: the log file may have been corrupt and it\n"
fputs("InnoDB: WARNING: the log file may have been corrupt and it\n"
"InnoDB: is possible that the log scan did not proceed\n"
"InnoDB: far enough in recovery! Please run CHECK TABLE\n"
"InnoDB: on your InnoDB tables to check that they are ok!\n"
......
page/page0page.c
View file @ 917941e4
......@@ -1880,8 +1880,7 @@ page_validate(
}
if (page_dir_slot_get_rec(slot) != rec) {
fputs(
"InnoDB: Dir slot does not"
fputs("InnoDB: Dir slot does not"
" point to right rec\n",
stderr);
goto func_exit;
......@@ -1962,8 +1961,7 @@ page_validate(
for (i = 0; i < rec_offs_size(offsets); i++) {
if (buf[offs + i] != 0) {
fputs(
"InnoDB: Record overlaps another"
fputs("InnoDB: Record overlaps another"
" in free list\n", stderr);
goto func_exit;
}
......
pars/pars0pars.c
View file @ 917941e4
......@@ -887,11 +887,12 @@ pars_process_assign_list(
pars_resolve_exp_columns(table_sym, assign_node->col);
pars_resolve_exp_columns(table_sym, assign_node->val);
pars_resolve_exp_variables_and_types(NULL, assign_node->val);
/* ut_a(dtype_get_mtype(dfield_get_type(
que_node_get_val(assign_node->col)))
== dtype_get_mtype(dfield_get_type(
que_node_get_val(assign_node->val)))); */
#if 0
ut_a(dtype_get_mtype
(dfield_get_type(que_node_get_val(assign_node->col)))
== dtype_get_mtype
(dfield_get_type(que_node_get_val(assign_node->val))));
#endif
/* Add to the update node all the columns found in assignment
values as columns to copy: therefore, TRUE */
......@@ -1478,8 +1479,7 @@ pars_fetch_statement(
if (into_list) {
ut_a(que_node_list_get_len(into_list)
== que_node_list_get_len(
node->cursor_def->select_list));
== que_node_list_get_len(node->cursor_def->select_list));
}
return(node);
......
rem/rem0cmp.c
View file @ 917941e4
......@@ -530,8 +530,7 @@ cmp_dtuple_rec_with_match(
&& dtype_get_charset_coll(cur_type->prtype) !=
DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL)) {
ret = cmp_whole_field(
cur_type,
ret = cmp_whole_field(cur_type,
dfield_get_data(dtuple_field),
(unsigned) dtuple_f_len,
rec_b_ptr, (unsigned) rec_f_len);
......
row/row0ins.c
View file @ 917941e4
......@@ -933,8 +933,7 @@ row_ins_foreign_check_on_constraint(
|| btr_pcur_get_low_match(cascade->pcur)
< dict_index_get_n_unique(clust_index)) {
fputs(
"InnoDB: error in cascade of a foreign key op\n"
fputs("InnoDB: error in cascade of a foreign key op\n"
"InnoDB: ", stderr);
dict_index_name_print(stderr, trx, index);
......
row/row0mysql.c
View file @ 917941e4
......@@ -514,8 +514,7 @@ handle_new_error:
} else if (err == DB_MUST_GET_MORE_FILE_SPACE) {
fputs(
"InnoDB: The database cannot continue"
fputs("InnoDB: The database cannot continue"
" operation because of\n"
"InnoDB: lack of space. You must add"
" a new data file to\n"
......@@ -524,8 +523,7 @@ handle_new_error:
exit(1);
} else if (err == DB_CORRUPTION) {
fputs(
"InnoDB: We detected index corruption"
fputs("InnoDB: We detected index corruption"
" in an InnoDB type table.\n"
"InnoDB: You have to dump + drop + reimport"
" the table or, in\n"
......@@ -714,8 +712,7 @@ row_prebuilt_free(
|| (ROW_PREBUILT_FETCH_MAGIC_N !=
mach_read_from_4((prebuilt->fetch_cache[i])
+ prebuilt->mysql_row_len))) {
fputs(
"InnoDB: Error: trying to free"
fputs("InnoDB: Error: trying to free"
" a corrupt fetch buffer.\n", stderr);
mem_analyze_corruption
......@@ -1094,8 +1091,7 @@ row_insert_for_mysql(
}
if (srv_created_new_raw || srv_force_recovery) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that"
......@@ -1333,8 +1329,7 @@ row_update_for_mysql(
}
if (srv_created_new_raw || srv_force_recovery) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that newraw"
......@@ -1754,8 +1749,7 @@ row_create_table_for_mysql(
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
if (srv_created_new_raw) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that newraw"
......@@ -2705,8 +2699,7 @@ row_truncate_table_for_mysql(
ut_ad(table);
if (srv_created_new_raw) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that newraw"
......@@ -2945,8 +2938,7 @@ row_drop_table_for_mysql(
ut_a(name != NULL);
if (srv_created_new_raw) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that newraw"
......@@ -3361,8 +3353,7 @@ loop:
row_mysql_unlock_data_dictionary(trx);
ut_print_timestamp(stderr);
fputs(
" InnoDB: Warning: MySQL is trying to"
fputs(" InnoDB: Warning: MySQL is trying to"
" drop database ", stderr);
ut_print_name(stderr, trx, TRUE, name);
fputs("\n"
......@@ -3497,8 +3488,7 @@ row_rename_table_for_mysql(
ut_a(new_name != NULL);
if (srv_created_new_raw || srv_force_recovery) {
fputs(
"InnoDB: A new raw disk partition was initialized or\n"
fputs("InnoDB: A new raw disk partition was initialized or\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n"
"InnoDB: database modifications by the user. Shut down\n"
"InnoDB: mysqld and edit my.cnf so that newraw"
......@@ -3709,8 +3699,7 @@ end:
if (err != DB_SUCCESS) {
if (err == DB_DUPLICATE_KEY) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error; possible reasons:\n"
fputs(" InnoDB: Error; possible reasons:\n"
"InnoDB: 1) Table rename would cause"
" two FOREIGN KEY constraints\n"
"InnoDB: to have the same internal name"
......@@ -3729,8 +3718,7 @@ end:
"innodb-troubleshooting.html\n"
"InnoDB: If table ", stderr);
ut_print_name(stderr, trx, TRUE, new_name);
fputs(
" is a temporary table #sql..., then"
fputs(" is a temporary table #sql..., then"
" it can be that\n"
"InnoDB: there are still queries running"
" on the table, and it will be\n"
......@@ -3792,8 +3780,7 @@ end:
" with the new table definition.\n",
stderr);
} else {
fputs(
" InnoDB: Error: in RENAME TABLE"
fputs(" InnoDB: Error: in RENAME TABLE"
" table ",
stderr);
ut_print_name(stderr, trx, TRUE, new_name);
......
row/row0sel.c
View file @ 917941e4
......@@ -2356,8 +2356,7 @@ row_sel_convert_mysql_key_to_innobase(
ut_print_timestamp(stderr);
fputs(
" InnoDB: Warning: using a partial-field"
fputs(" InnoDB: Warning: using a partial-field"
" key prefix in search.\n"
"InnoDB: ", stderr);
dict_index_name_print(stderr, trx, index);
......@@ -3024,8 +3023,7 @@ row_sel_pop_cached_row_for_mysql(
for (i = 0; i < prebuilt->n_template; i++) {
templ = prebuilt->mysql_template + i;
ut_memcpy(
buf + templ->mysql_col_offset,
ut_memcpy(buf + templ->mysql_col_offset,
cached_rec + templ->mysql_col_offset,
templ->mysql_col_len);
/* Copy NULL bit of the current field from cached_rec
......
srv/srv0srv.c
View file @ 917941e4
......@@ -992,8 +992,7 @@ srv_conc_enter_innodb(
retry:
if (trx->declared_to_be_inside_innodb) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: trying to declare trx"
fputs(" InnoDB: Error: trying to declare trx"
" to enter InnoDB, but\n"
"InnoDB: it already is declared.\n", stderr);
trx_print(stderr, trx, 0);
......
trx/trx0trx.c
View file @ 917941e4
......@@ -286,8 +286,7 @@ trx_free(
if (trx->declared_to_be_inside_innodb) {
ut_print_timestamp(stderr);
fputs(
" InnoDB: Error: Freeing a trx which is declared"
fputs(" InnoDB: Error: Freeing a trx which is declared"
" to be processing\n"
"InnoDB: inside InnoDB.\n", stderr);
trx_print(stderr, trx, 600);
......
ut/ut0dbg.c
View file @ 917941e4
......@@ -50,8 +50,7 @@ ut_dbg_assertion_failed(
"InnoDB: Failing assertion: %s\n", expr);
}
fputs(
"InnoDB: We intentionally generate a memory trap.\n"
fputs("InnoDB: We intentionally generate a memory trap.\n"
"InnoDB: Submit a detailed bug report"
" to http://bugs.mysql.com.\n"
"InnoDB: If you get repeated assertion failures"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7