Skip to content

M
MariaDB
Commit f6796c01 authored by osku's avatar osku
Browse files
Options

Remove tabs from within printed strings and two instances of trailing 

whitespace.
parent 70ae3267
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
buf/buf0buf.c
View file @ f6796c01
...@@ -2291,7 +2291,7 @@ buf_print_io( ...@@ -2291,7 +2291,7 @@ buf_print_io(
if (srv_use_awe) { if (srv_use_awe) {
fprintf(stderr, fprintf(stderr,
"AWE: Buffer pool memory frames %lu\n", "AWE: Buffer pool memory frames %lu\n",
(ulong) buf_pool->n_frames); (ulong) buf_pool->n_frames);
fprintf(stderr, fprintf(stderr,
...@@ -2300,8 +2300,8 @@ buf_print_io( ...@@ -2300,8 +2300,8 @@ buf_print_io(
} }
fprintf(file, fprintf(file,
"Buffer pool size %lu\n" "Buffer pool size %lu\n"
"Free buffers %lu\n" "Free buffers %lu\n"
"Database pages %lu\n" "Database pages %lu\n"
"Modified db pages %lu\n" "Modified db pages %lu\n"
"Pending reads %lu\n" "Pending reads %lu\n"
"Pending writes: LRU %lu, flush list %lu, single page %lu\n", "Pending writes: LRU %lu, flush list %lu, single page %lu\n",
......
dict/dict0dict.c
View file @ f6796c01
...@@ -4118,7 +4118,7 @@ dict_foreign_print_low( ...@@ -4118,7 +4118,7 @@ dict_foreign_print_low(
} }
fprintf(stderr, " )\n" fprintf(stderr, " )\n"
" REFERENCES %s (", " REFERENCES %s (",
foreign->referenced_table_name); foreign->referenced_table_name);
for (i = 0; i < foreign->n_fields; i++) { for (i = 0; i < foreign->n_fields; i++) {
......
fil/fil0fil.c
View file @ f6796c01
...@@ -2200,7 +2200,7 @@ fil_rename_tablespace( ...@@ -2200,7 +2200,7 @@ fil_rename_tablespace(
if (count > 1000) { if (count > 1000) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Warning: problems renaming ", stderr); fputs(" InnoDB: Warning: problems renaming ", stderr);
ut_print_filename(stderr, old_name); ut_print_filename(stderr, old_name);
fputs(" to ", stderr); fputs(" to ", stderr);
ut_print_filename(stderr, new_name); ut_print_filename(stderr, new_name);
...@@ -2353,7 +2353,7 @@ fil_create_new_single_table_tablespace( ...@@ -2353,7 +2353,7 @@ fil_create_new_single_table_tablespace(
OS_DATA_FILE, &ret); OS_DATA_FILE, &ret);
if (ret == FALSE) { if (ret == FALSE) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error creating file ", stderr); fputs(" InnoDB: Error creating file ", stderr);
ut_print_filename(stderr, path); ut_print_filename(stderr, path);
fputs(".\n", stderr); fputs(".\n", stderr);
...@@ -3351,7 +3351,7 @@ fil_space_for_table_exists_in_mem( ...@@ -3351,7 +3351,7 @@ fil_space_for_table_exists_in_mem(
if (space == NULL) { if (space == NULL) {
if (namespace == NULL) { if (namespace == NULL) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_filename(stderr, name); ut_print_filename(stderr, name);
fprintf(stderr, "\n" fprintf(stderr, "\n"
"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n" "InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"
...@@ -3363,7 +3363,7 @@ fil_space_for_table_exists_in_mem( ...@@ -3363,7 +3363,7 @@ fil_space_for_table_exists_in_mem(
(ulong) id); (ulong) id);
} else { } else {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_filename(stderr, name); ut_print_filename(stderr, name);
fprintf(stderr, "\n" fprintf(stderr, "\n"
"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n" "InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"
...@@ -3388,7 +3388,7 @@ fil_space_for_table_exists_in_mem( ...@@ -3388,7 +3388,7 @@ fil_space_for_table_exists_in_mem(
if (0 != strcmp(space->name, path)) { if (0 != strcmp(space->name, path)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_filename(stderr, name); ut_print_filename(stderr, name);
fprintf(stderr, "\n" fprintf(stderr, "\n"
"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n" "InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"
......
handler/ha_innodb.cc
View file @ f6796c01
...@@ -6790,7 +6790,7 @@ static INNOBASE_SHARE* get_share(const char* table_name) ...@@ -6790,7 +6790,7 @@ static INNOBASE_SHARE* get_share(const char* table_name)
share = (INNOBASE_SHARE *) my_malloc(sizeof(*share)+length+1, share = (INNOBASE_SHARE *) my_malloc(sizeof(*share)+length+1,
MYF(MY_FAE | MY_ZEROFILL)); MYF(MY_FAE | MY_ZEROFILL));
share->table_name_length=length; share->table_name_length=length;
share->table_name=(char*) (share+1); share->table_name=(char*) (share+1);
strmov(share->table_name,table_name); strmov(share->table_name,table_name);
......
ibuf/ibuf0ibuf.c
View file @ f6796c01
...@@ -3132,7 +3132,7 @@ ibuf_merge_or_delete_for_page( ...@@ -3132,7 +3132,7 @@ ibuf_merge_or_delete_for_page(
mtr_start(&mtr); mtr_start(&mtr);
fputs(" InnoDB: Dump of the ibuf bitmap page:\n", fputs(" InnoDB: Dump of the ibuf bitmap page:\n",
stderr); stderr);
bitmap_page = ibuf_bitmap_get_map_page(space, page_no, bitmap_page = ibuf_bitmap_get_map_page(space, page_no,
......
include/univ.i
View file @ f6796c01
...@@ -163,7 +163,7 @@ management to ensure correct alignment for doubles etc. */ ...@@ -163,7 +163,7 @@ management to ensure correct alignment for doubles etc. */
#define UNIV_PAGE_SIZE (2 * 8192) /* NOTE! Currently, this has to be a #define UNIV_PAGE_SIZE (2 * 8192) /* NOTE! Currently, this has to be a
power of 2 */ power of 2 */
/* The 2-logarithm of UNIV_PAGE_SIZE: */ /* The 2-logarithm of UNIV_PAGE_SIZE: */
#define UNIV_PAGE_SIZE_SHIFT 14 #define UNIV_PAGE_SIZE_SHIFT 14
/* Maximum number of parallel threads in a parallelized operation */ /* Maximum number of parallel threads in a parallelized operation */
#define UNIV_MAX_PARALLELISM 32 #define UNIV_MAX_PARALLELISM 32
......
lock/lock0lock.c
View file @ f6796c01
...@@ -476,7 +476,7 @@ lock_check_trx_id_sanity( ...@@ -476,7 +476,7 @@ lock_check_trx_id_sanity(
if (ut_dulint_cmp(trx_id, trx_sys->max_trx_id) >= 0) { if (ut_dulint_cmp(trx_id, trx_sys->max_trx_id) >= 0) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: transaction id associated" fputs(" InnoDB: Error: transaction id associated"
" with record\n", " with record\n",
stderr); stderr);
rec_print_new(stderr, rec, offsets); rec_print_new(stderr, rec, offsets);
......
log/log0recv.c
View file @ f6796c01
...@@ -2695,7 +2695,7 @@ recv_recovery_from_checkpoint_start( ...@@ -2695,7 +2695,7 @@ recv_recovery_from_checkpoint_start(
< 0) { < 0) {
fprintf(stderr, fprintf(stderr,
"InnoDB: ##########################################################\n" "InnoDB: ##########################################################\n"
"InnoDB: WARNING!\n" "InnoDB: WARNING!\n"
"InnoDB: The log sequence number in ibdata files is higher\n" "InnoDB: The log sequence number in ibdata files is higher\n"
"InnoDB: than the log sequence number in the ib_logfiles! Are you sure\n" "InnoDB: than the log sequence number in the ib_logfiles! Are you sure\n"
"InnoDB: you are using the right ib_logfiles to start up the database?\n" "InnoDB: you are using the right ib_logfiles to start up the database?\n"
......
mem/mem0dbg.c
View file @ f6796c01
...@@ -894,17 +894,17 @@ mem_print_info_low( ...@@ -894,17 +894,17 @@ mem_print_info_low(
fprintf(outfile, "\n"); fprintf(outfile, "\n");
fprintf(outfile, "Current allocated memory : %lu\n", fprintf(outfile, "Current allocated memory : %lu\n",
mem_current_allocated_memory); mem_current_allocated_memory);
fprintf(outfile, "Current allocated heaps and buffers : %lu\n", fprintf(outfile, "Current allocated heaps and buffers : %lu\n",
n_heaps); n_heaps);
fprintf(outfile, "Cumulative allocated memory : %lu\n", fprintf(outfile, "Cumulative allocated memory : %lu\n",
mem_total_allocated_memory); mem_total_allocated_memory);
fprintf(outfile, "Maximum allocated memory : %lu\n", fprintf(outfile, "Maximum allocated memory : %lu\n",
mem_max_allocated_memory); mem_max_allocated_memory);
fprintf(outfile, "Cumulative created heaps and buffers : %lu\n", fprintf(outfile, "Cumulative created heaps and buffers : %lu\n",
mem_n_created_heaps); mem_n_created_heaps);
fprintf(outfile, "Cumulative number of allocations : %lu\n", fprintf(outfile, "Cumulative number of allocations : %lu\n",
mem_n_allocations); mem_n_allocations);
mem_last_print_info = mem_n_created_heaps; mem_last_print_info = mem_n_created_heaps;
......
os/os0file.c
View file @ f6796c01
...@@ -1305,7 +1305,7 @@ os_file_create( ...@@ -1305,7 +1305,7 @@ os_file_create(
if (create_mode == OS_FILE_OPEN_RETRY) { if (create_mode == OS_FILE_OPEN_RETRY) {
int i; int i;
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Retrying to lock the first data file\n", fputs(" InnoDB: Retrying to lock the first data file\n",
stderr); stderr);
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
os_thread_sleep(1000000); os_thread_sleep(1000000);
...@@ -1315,7 +1315,7 @@ os_file_create( ...@@ -1315,7 +1315,7 @@ os_file_create(
} }
} }
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Unable to open the first data file\n", fputs(" InnoDB: Unable to open the first data file\n",
stderr); stderr);
} }
close(file); close(file);
......
page/page0page.c
View file @ f6796c01
...@@ -1284,7 +1284,7 @@ page_rec_print( ...@@ -1284,7 +1284,7 @@ page_rec_print(
ut_a(!comp == !rec_offs_comp(offsets)); ut_a(!comp == !rec_offs_comp(offsets));
rec_print_new(stderr, rec, offsets); rec_print_new(stderr, rec, offsets);
fprintf(stderr, fprintf(stderr,
" n_owned: %lu; heap_no: %lu; next rec: %lu\n", " n_owned: %lu; heap_no: %lu; next rec: %lu\n",
(ulong) rec_get_n_owned(rec, comp), (ulong) rec_get_n_owned(rec, comp),
(ulong) rec_get_heap_no(rec, comp), (ulong) rec_get_heap_no(rec, comp),
(ulong) rec_get_next_offs(rec, comp)); (ulong) rec_get_next_offs(rec, comp));
...@@ -1317,7 +1317,7 @@ page_dir_print( ...@@ -1317,7 +1317,7 @@ page_dir_print(
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
slot = page_dir_get_nth_slot(page, i); slot = page_dir_get_nth_slot(page, i);
if ((i == pr_n) && (i < n - pr_n)) { if ((i == pr_n) && (i < n - pr_n)) {
fputs(" ... \n", stderr); fputs(" ... \n", stderr);
} }
if ((i < pr_n) || (i >= n - pr_n)) { if ((i < pr_n) || (i >= n - pr_n)) {
fprintf(stderr, fprintf(stderr,
......
row/row0mysql.c
View file @ f6796c01
...@@ -1916,7 +1916,7 @@ row_create_table_for_mysql( ...@@ -1916,7 +1916,7 @@ row_create_table_for_mysql(
if (err == DB_OUT_OF_FILE_SPACE) { if (err == DB_OUT_OF_FILE_SPACE) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Warning: cannot create table ", fputs(" InnoDB: Warning: cannot create table ",
stderr); stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs(" because tablespace full\n", stderr); fputs(" because tablespace full\n", stderr);
...@@ -1930,7 +1930,7 @@ row_create_table_for_mysql( ...@@ -1930,7 +1930,7 @@ row_create_table_for_mysql(
} else if (err == DB_DUPLICATE_KEY) { } else if (err == DB_DUPLICATE_KEY) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs(" already exists in InnoDB internal\n" fputs(" already exists in InnoDB internal\n"
"InnoDB: data dictionary. Have you deleted the .frm file\n" "InnoDB: data dictionary. Have you deleted the .frm file\n"
...@@ -2007,7 +2007,7 @@ row_create_index_for_mysql( ...@@ -2007,7 +2007,7 @@ row_create_index_for_mysql(
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: column ", stderr); fputs(" InnoDB: Error: column ", stderr);
ut_print_name(stderr, trx, ut_print_name(stderr, trx,
dict_index_get_nth_field(index, i)->name); dict_index_get_nth_field(index, i)->name);
fputs(" appears twice in ", stderr); fputs(" appears twice in ", stderr);
...@@ -2437,7 +2437,7 @@ do not allow the discard. We also reserve the data dictionary latch. */ ...@@ -2437,7 +2437,7 @@ do not allow the discard. We also reserve the data dictionary latch. */
if (table->space == 0) { if (table->space == 0) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs("\n" fputs("\n"
"InnoDB: is in the system tablespace 0 which cannot be discarded\n", stderr); "InnoDB: is in the system tablespace 0 which cannot be discarded\n", stderr);
...@@ -2449,7 +2449,7 @@ do not allow the discard. We also reserve the data dictionary latch. */ ...@@ -2449,7 +2449,7 @@ do not allow the discard. We also reserve the data dictionary latch. */
if (table->n_foreign_key_checks_running > 0) { if (table->n_foreign_key_checks_running > 0) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: You are trying to DISCARD table ", stderr); fputs(" InnoDB: You are trying to DISCARD table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs("\n" fputs("\n"
"InnoDB: though there is a foreign key check running on it.\n" "InnoDB: though there is a foreign key check running on it.\n"
...@@ -2483,7 +2483,7 @@ do not allow the discard. We also reserve the data dictionary latch. */ ...@@ -2483,7 +2483,7 @@ do not allow the discard. We also reserve the data dictionary latch. */
rewind(ef); rewind(ef);
ut_print_timestamp(ef); ut_print_timestamp(ef);
fputs(" Cannot DISCARD table ", ef); fputs(" Cannot DISCARD table ", ef);
ut_print_name(ef, trx, name); ut_print_name(ef, trx, name);
fputs("\n" fputs("\n"
"because it is referenced by ", ef); "because it is referenced by ", ef);
...@@ -2602,7 +2602,7 @@ row_import_tablespace_for_mysql( ...@@ -2602,7 +2602,7 @@ row_import_tablespace_for_mysql(
if (!success) { if (!success) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: cannot reset lsn's in table ", stderr); fputs(" InnoDB: Error: cannot reset lsn's in table ", stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs("\n" fputs("\n"
"InnoDB: in ALTER TABLE ... IMPORT TABLESPACE\n", stderr); "InnoDB: in ALTER TABLE ... IMPORT TABLESPACE\n", stderr);
...@@ -2623,7 +2623,7 @@ row_import_tablespace_for_mysql( ...@@ -2623,7 +2623,7 @@ row_import_tablespace_for_mysql(
if (!table) { if (!table) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: table ", stderr); fputs(" InnoDB: table ", stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs("\n" fputs("\n"
"InnoDB: does not exist in the InnoDB data dictionary\n" "InnoDB: does not exist in the InnoDB data dictionary\n"
...@@ -2637,7 +2637,7 @@ row_import_tablespace_for_mysql( ...@@ -2637,7 +2637,7 @@ row_import_tablespace_for_mysql(
if (table->space == 0) { if (table->space == 0) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs("\n" fputs("\n"
"InnoDB: is in the system tablespace 0 which cannot be imported\n", stderr); "InnoDB: is in the system tablespace 0 which cannot be imported\n", stderr);
...@@ -2821,7 +2821,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */ ...@@ -2821,7 +2821,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */
rewind(ef); rewind(ef);
ut_print_timestamp(ef); ut_print_timestamp(ef);
fputs(" Cannot truncate table ", ef); fputs(" Cannot truncate table ", ef);
ut_print_name(ef, trx, table->name); ut_print_name(ef, trx, table->name);
fputs(" by DROP+CREATE\n" fputs(" by DROP+CREATE\n"
"InnoDB: because it is referenced by ", ef); "InnoDB: because it is referenced by ", ef);
...@@ -2841,7 +2841,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */ ...@@ -2841,7 +2841,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */
if (table->n_foreign_key_checks_running > 0) { if (table->n_foreign_key_checks_running > 0) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Cannot truncate table ", stderr); fputs(" InnoDB: Cannot truncate table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs(" by DROP+CREATE\n" fputs(" by DROP+CREATE\n"
"InnoDB: because there is a foreign key check running on it.\n", "InnoDB: because there is a foreign key check running on it.\n",
...@@ -2964,7 +2964,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */ ...@@ -2964,7 +2964,7 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */
trx_general_rollback_for_mysql(trx, FALSE, NULL); trx_general_rollback_for_mysql(trx, FALSE, NULL);
trx->error_state = DB_SUCCESS; trx->error_state = DB_SUCCESS;
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Unable to assign a new identifier to table ", stderr); fputs(" InnoDB: Unable to assign a new identifier to table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs("\n" fputs("\n"
"InnoDB: after truncating it. Background processes may corrupt the table!\n", "InnoDB: after truncating it. Background processes may corrupt the table!\n",
...@@ -3179,7 +3179,7 @@ row_drop_table_for_mysql( ...@@ -3179,7 +3179,7 @@ row_drop_table_for_mysql(
err = DB_TABLE_NOT_FOUND; err = DB_TABLE_NOT_FOUND;
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs(" does not exist in the InnoDB internal\n" fputs(" does not exist in the InnoDB internal\n"
"InnoDB: data dictionary though MySQL is trying to drop it.\n" "InnoDB: data dictionary though MySQL is trying to drop it.\n"
...@@ -3215,7 +3215,7 @@ row_drop_table_for_mysql( ...@@ -3215,7 +3215,7 @@ row_drop_table_for_mysql(
rewind(ef); rewind(ef);
ut_print_timestamp(ef); ut_print_timestamp(ef);
fputs(" Cannot drop table ", ef); fputs(" Cannot drop table ", ef);
ut_print_name(ef, trx, name); ut_print_name(ef, trx, name);
fputs("\n" fputs("\n"
"because it is referenced by ", ef); "because it is referenced by ", ef);
...@@ -3237,7 +3237,7 @@ row_drop_table_for_mysql( ...@@ -3237,7 +3237,7 @@ row_drop_table_for_mysql(
if (added) { if (added) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Warning: MySQL is trying to drop table ", stderr); fputs(" InnoDB: Warning: MySQL is trying to drop table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs("\n" fputs("\n"
"InnoDB: though there are still open handles to it.\n" "InnoDB: though there are still open handles to it.\n"
...@@ -3270,7 +3270,7 @@ fputs(" InnoDB: Warning: MySQL is trying to drop table ", stderr); ...@@ -3270,7 +3270,7 @@ fputs(" InnoDB: Warning: MySQL is trying to drop table ", stderr);
if (added) { if (added) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: You are trying to drop table ", stderr); fputs(" InnoDB: You are trying to drop table ", stderr);
ut_print_name(stderr, trx, table->name); ut_print_name(stderr, trx, table->name);
fputs("\n" fputs("\n"
"InnoDB: though there is a foreign key check running on it.\n" "InnoDB: though there is a foreign key check running on it.\n"
...@@ -3330,7 +3330,7 @@ fputs(" InnoDB: You are trying to drop table ", stderr); ...@@ -3330,7 +3330,7 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
if (dict_load_table(name) != NULL) { if (dict_load_table(name) != NULL) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: not able to remove table ", fputs(" InnoDB: Error: not able to remove table ",
stderr); stderr);
ut_print_name(stderr, trx, name); ut_print_name(stderr, trx, name);
fputs(" from the dictionary cache!\n", stderr); fputs(" from the dictionary cache!\n", stderr);
...@@ -3648,7 +3648,7 @@ row_rename_table_for_mysql( ...@@ -3648,7 +3648,7 @@ row_rename_table_for_mysql(
err = DB_TABLE_NOT_FOUND; err = DB_TABLE_NOT_FOUND;
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, old_name); ut_print_name(stderr, trx, old_name);
fputs(" does not exist in the InnoDB internal\n" fputs(" does not exist in the InnoDB internal\n"
"InnoDB: data dictionary though MySQL is trying to rename the table.\n" "InnoDB: data dictionary though MySQL is trying to rename the table.\n"
...@@ -3664,7 +3664,7 @@ row_rename_table_for_mysql( ...@@ -3664,7 +3664,7 @@ row_rename_table_for_mysql(
err = DB_TABLE_NOT_FOUND; err = DB_TABLE_NOT_FOUND;
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: table ", stderr); fputs(" InnoDB: Error: table ", stderr);
ut_print_name(stderr, trx, old_name); ut_print_name(stderr, trx, old_name);
fputs( fputs(
" does not have an .ibd file in the database directory.\n" " does not have an .ibd file in the database directory.\n"
...@@ -3798,7 +3798,7 @@ row_rename_table_for_mysql( ...@@ -3798,7 +3798,7 @@ row_rename_table_for_mysql(
if (err == DB_DUPLICATE_KEY) { if (err == DB_DUPLICATE_KEY) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs( fputs(
" InnoDB: Error; possible reasons:\n" " InnoDB: Error; possible reasons:\n"
"InnoDB: 1) Table rename would cause two FOREIGN KEY constraints\n" "InnoDB: 1) Table rename would cause two FOREIGN KEY constraints\n"
"InnoDB: to have the same internal name in case-insensitive comparison.\n" "InnoDB: to have the same internal name in case-insensitive comparison.\n"
"InnoDB: 2) table ", stderr); "InnoDB: 2) table ", stderr);
...@@ -3858,7 +3858,7 @@ row_rename_table_for_mysql( ...@@ -3858,7 +3858,7 @@ row_rename_table_for_mysql(
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
if (old_is_tmp) { if (old_is_tmp) {
fputs(" InnoDB: Error: in ALTER TABLE ", fputs(" InnoDB: Error: in ALTER TABLE ",
stderr); stderr);
ut_print_name(stderr, trx, new_name); ut_print_name(stderr, trx, new_name);
fputs("\n" fputs("\n"
......
row/row0sel.c
View file @ f6796c01
...@@ -2714,7 +2714,7 @@ row_sel_get_clust_rec_for_mysql( ...@@ -2714,7 +2714,7 @@ row_sel_get_clust_rec_for_mysql(
if (!rec_get_deleted_flag(rec, sec_index->table->comp) if (!rec_get_deleted_flag(rec, sec_index->table->comp)
|| prebuilt->select_lock_type != LOCK_NONE) { || prebuilt->select_lock_type != LOCK_NONE) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: error clustered record" fputs(" InnoDB: error clustered record"
" for sec rec not found\n" " for sec rec not found\n"
"InnoDB: ", stderr); "InnoDB: ", stderr);
dict_index_name_print(stderr, trx, sec_index); dict_index_name_print(stderr, trx, sec_index);
......
srv/srv0start.c
View file @ f6796c01
...@@ -1753,7 +1753,7 @@ innobase_shutdown_for_mysql(void) ...@@ -1753,7 +1753,7 @@ innobase_shutdown_for_mysql(void)
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB: Warning: shutting down a not properly started\n" " InnoDB: Warning: shutting down a not properly started\n"
" InnoDB: or created database!\n"); " InnoDB: or created database!\n");
} }
return(DB_SUCCESS); return(DB_SUCCESS);
......
trx/trx0roll.c
View file @ f6796c01
...@@ -240,7 +240,7 @@ trx_rollback_to_savepoint_for_mysql( ...@@ -240,7 +240,7 @@ trx_rollback_to_savepoint_for_mysql(
if (trx->conc_state == TRX_NOT_STARTED) { if (trx->conc_state == TRX_NOT_STARTED) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fputs(" InnoDB: Error: transaction has a savepoint ", stderr); fputs(" InnoDB: Error: transaction has a savepoint ", stderr);
ut_print_name(stderr, trx, savep->name); ut_print_name(stderr, trx, savep->name);
fputs(" though it is not started\n", stderr); fputs(" though it is not started\n", stderr);
return(DB_ERROR); return(DB_ERROR);
......
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