Skip to content

M
MariaDB
Commit fc6dcf4d authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files
Options

log0recv.c Change Innobase text to InnoDB 

log0log.c	Change Innobase text to InnoDB
srv0start.c	Change Innobase text to InnoDB
srv0srv.c	Change Innobase text to InnoDB
ha_innobase.cc	Change Innobase text to InnoDB
parent b897f84d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 160 deletions
BitKeeper/etc/logging_ok
View file @ fc6dcf4d
paul@central.snake.net
monty@donna.mysql.fi
heikki@donna.mysql.fi
innobase/log/log0log.c
View file @ fc6dcf4d
/******************************************************
Database log
(c) 1995-1997 Innobase Oy
(c) 1995-1997 InnoDB Oy
Created 12/9/1995 Heikki Tuuri
*******************************************************/
......@@ -1886,12 +1886,12 @@ log_group_archive(
if (!ret) {
fprintf(stderr,
"Innobase: Cannot create or open archive log file %s.\n",
"InnoDB: Cannot create or open archive log file %s.\n",
name);
fprintf(stderr, "Innobase: Cannot continue operation.\n"
"Innobase: Check that the log archive directory exists,\n"
"Innobase: you have access rights to it, and\n"
"Innobase: there is space available.\n");
fprintf(stderr, "InnoDB: Cannot continue operation.\n"
"InnoDB: Check that the log archive directory exists,\n"
"InnoDB: you have access rights to it, and\n"
"InnoDB: there is space available.\n");
exit(1);
}
......@@ -2628,7 +2628,7 @@ logs_empty_and_mark_files_at_shutdown(void)
dulint lsn;
ulint arch_log_no;
fprintf(stderr, "Innobase: Starting shutdown...\n");
fprintf(stderr, "InnoDB: Starting shutdown...\n");
/* Wait until the master thread and all other operations are idle: our
algorithm only works if the server is idle at shutdown */
......@@ -2718,7 +2718,7 @@ logs_empty_and_mark_files_at_shutdown(void)
fil_flush_file_spaces(FIL_TABLESPACE);
fprintf(stderr, "Innobase: Shutdown completed\n");
fprintf(stderr, "InnoDB: Shutdown completed\n");
}
/**********************************************************
......
innobase/log/log0recv.c
View file @ fc6dcf4d
/******************************************************
Recovery
(c) 1997 Innobase Oy
(c) 1997 InnoDB Oy
Created 9/20/1997 Heikki Tuuri
*******************************************************/
......@@ -412,7 +412,7 @@ recv_find_max_checkpoint(
+ LOG_CHECKPOINT_CHECKSUM_1)) {
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Checkpoint in group %lu at %lu invalid, %lu, %lu\n",
"InnoDB: Checkpoint in group %lu at %lu invalid, %lu, %lu\n",
group->id, field,
fold & 0xFFFFFFFF,
mach_read_from_4(buf
......@@ -431,7 +431,7 @@ recv_find_max_checkpoint(
+ LOG_CHECKPOINT_CHECKSUM_2)) {
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Checkpoint in group %lu at %lu invalid, %lu, %lu\n",
"InnoDB: Checkpoint in group %lu at %lu invalid, %lu, %lu\n",
group->id, field,
fold & 0xFFFFFFFF,
mach_read_from_4(buf
......@@ -451,7 +451,7 @@ recv_find_max_checkpoint(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Checkpoint number %lu found in group %lu\n",
"InnoDB: Checkpoint number %lu found in group %lu\n",
ut_dulint_get_low(checkpoint_no), group->id);
}
......@@ -470,7 +470,7 @@ recv_find_max_checkpoint(
if (*max_group == NULL) {
fprintf(stderr, "Innobase: No valid checkpoint found\n");
fprintf(stderr, "InnoDB: No valid checkpoint found\n");
return(DB_ERROR);
}
......@@ -866,7 +866,7 @@ recv_recover_page(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Applying log rec type %lu len %lu to space %lu page no %lu\n",
"InnoDB: Applying log rec type %lu len %lu to space %lu page no %lu\n",
(ulint)recv->type, recv->len, recv_addr->space,
recv_addr->page_no);
}
......@@ -1015,7 +1015,7 @@ recv_apply_hashed_log_recs(
if (recv_addr->state == RECV_NOT_PROCESSED) {
if (!has_printed) {
fprintf(stderr,
"Innobase: Starting an apply batch of log records to the database...\n");
"InnoDB: Starting an apply batch of log records to the database...\n");
has_printed = TRUE;
}
......@@ -1082,7 +1082,7 @@ recv_apply_hashed_log_recs(
recv_sys_empty_hash();
if (has_printed) {
fprintf(stderr, "Innobase: Apply batch completed\n");
fprintf(stderr, "InnoDB: Apply batch completed\n");
}
mutex_exit(&(recv_sys->mutex));
......@@ -1454,7 +1454,7 @@ recv_parse_log_recs(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Parsed a single log rec type %lu len %lu space %lu page no %lu\n",
"InnoDB: Parsed a single log rec type %lu len %lu space %lu page no %lu\n",
(ulint)type, len, space, page_no);
}
......@@ -1503,7 +1503,7 @@ recv_parse_log_recs(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Parsed a multi log rec type %lu len %lu space %lu page no %lu\n",
"InnoDB: Parsed a multi log rec type %lu len %lu space %lu page no %lu\n",
(ulint)type, len, space, page_no);
}
......@@ -1824,7 +1824,7 @@ recv_scan_log_recs(
if (more_data) {
fprintf(stderr,
"Innobase: Doing recovery: scanned up to log sequence number %lu %lu\n",
"InnoDB: Doing recovery: scanned up to log sequence number %lu %lu\n",
ut_dulint_get_high(*group_scanned_lsn),
ut_dulint_get_low(*group_scanned_lsn));
......@@ -1877,7 +1877,7 @@ recv_group_scan_log_recs(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Scanned group %lu up to log sequence number %lu %lu\n",
"InnoDB: Scanned group %lu up to log sequence number %lu %lu\n",
group->id,
ut_dulint_get_high(*group_scanned_lsn),
ut_dulint_get_low(*group_scanned_lsn));
......@@ -1977,11 +1977,11 @@ recv_recovery_from_checkpoint_start(
|| ut_dulint_cmp(checkpoint_lsn, min_flushed_lsn) != 0) {
fprintf(stderr,
"Innobase: Database was not shut down normally.\n"
"Innobase: Starting recovery from log files...\n");
"InnoDB: Database was not shut down normally.\n"
"InnoDB: Starting recovery from log files...\n");
fprintf(stderr,
"Innobase: Starting log scan based on checkpoint at\n"
"Innobase: log sequence number %lu %lu\n",
"InnoDB: Starting log scan based on checkpoint at\n"
"InnoDB: log sequence number %lu %lu\n",
ut_dulint_get_high(checkpoint_lsn),
ut_dulint_get_low(checkpoint_lsn));
}
......@@ -2134,7 +2134,7 @@ recv_recovery_from_checkpoint_finish(void)
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Log records applied to the database\n");
"InnoDB: Log records applied to the database\n");
}
/* Free the resources of the recovery system */
......@@ -2246,12 +2246,12 @@ log_group_recover_from_archive_file(
fil_release_right_to_open();
ask_again:
fprintf(stderr,
"Innobase: Do you want to copy additional archived log files\n"
"Innobase: to the directory\n");
"InnoDB: Do you want to copy additional archived log files\n"
"InnoDB: to the directory\n");
fprintf(stderr,
"Innobase: or were these all the files needed in recovery?\n");
"InnoDB: or were these all the files needed in recovery?\n");
fprintf(stderr,
"Innobase: (Y == copy more files; N == this is all)?");
"InnoDB: (Y == copy more files; N == this is all)?");
input_char = getchar();
......@@ -2271,13 +2271,13 @@ log_group_recover_from_archive_file(
ut_a(file_size_high == 0);
fprintf(stderr, "Innobase: Opened archived log file %s\n", name);
fprintf(stderr, "InnoDB: Opened archived log file %s\n", name);
ret = os_file_close(file_handle);
if (file_size < LOG_FILE_HDR_SIZE) {
fprintf(stderr,
"Innobase: Archive file header incomplete %s\n", name);
"InnoDB: Archive file header incomplete %s\n", name);
return(TRUE);
}
......@@ -2302,14 +2302,14 @@ log_group_recover_from_archive_file(
|| mach_read_from_4(buf + LOG_FILE_NO)
!= group->archived_file_no) {
fprintf(stderr,
"Innobase: Archive file header inconsistent %s\n", name);
"InnoDB: Archive file header inconsistent %s\n", name);
return(TRUE);
}
if (!mach_read_from_4(buf + LOG_FILE_ARCH_COMPLETED)) {
fprintf(stderr,
"Innobase: Archive file not completely written %s\n", name);
"InnoDB: Archive file not completely written %s\n", name);
return(TRUE);
}
......@@ -2321,7 +2321,7 @@ log_group_recover_from_archive_file(
if (ut_dulint_cmp(recv_sys->parse_start_lsn, start_lsn) < 0) {
fprintf(stderr,
"Innobase: Archive log file %s starts from too big a lsn\n",
"InnoDB: Archive log file %s starts from too big a lsn\n",
name);
return(TRUE);
}
......@@ -2332,7 +2332,7 @@ log_group_recover_from_archive_file(
if (ut_dulint_cmp(recv_sys->scanned_lsn, start_lsn) != 0) {
fprintf(stderr,
"Innobase: Archive log file %s starts from a wrong lsn\n",
"InnoDB: Archive log file %s starts from a wrong lsn\n",
name);
return(TRUE);
}
......@@ -2354,7 +2354,7 @@ log_group_recover_from_archive_file(
if (log_debug_writes) {
fprintf(stderr,
"Innobase: Archive read starting at lsn %lu %lu, len %lu from file %s\n",
"InnoDB: Archive read starting at lsn %lu %lu, len %lu from file %s\n",
ut_dulint_get_high(start_lsn),
ut_dulint_get_low(start_lsn),
len, name);
......@@ -2375,7 +2375,7 @@ log_group_recover_from_archive_file(
if (ret) {
fprintf(stderr,
"Innobase: Archive log file %s does not scan right\n",
"InnoDB: Archive log file %s does not scan right\n",
name);
return(TRUE);
}
......@@ -2435,7 +2435,7 @@ recv_recovery_from_archive_start(
if (!group) {
fprintf(stderr,
"Innobase: There is no log group defined with id %lu!\n",
"InnoDB: There is no log group defined with id %lu!\n",
group_id);
return(DB_ERROR);
}
......
innobase/srv/srv0srv.c
View file @ fc6dcf4d
......@@ -7,7 +7,7 @@ thread is usually allocated per processor. Win32
documentation does not know any UMS threads, which suggests
that the concept is internal to SQL Server 7. It may mean that
SQL Server 7 does all the scheduling of threads itself, even
in i/o waits. We should maybe modify Innobase to use the same
in i/o waits. We should maybe modify InnoDB to use the same
technique, because thread switches within NT may be too slow.
SQL Server 7 also mentions fibers, which are cooperatively
......@@ -20,7 +20,7 @@ Windows 2000 will have something called thread pooling
Another possibility could be to use some very fast user space
thread library. This might confuse NT though.
(c) 1995 Innobase Oy
(c) 1995 InnoDB Oy
Created 10/8/1995 Heikki Tuuri
*******************************************************/
......@@ -1093,7 +1093,7 @@ srv_read_init_val(
return(DB_ERROR);
}
printf("Error in Innobase booting: keyword %s not found\n",
printf("Error in InnoDB booting: keyword %s not found\n",
keyword);
printf("from the initfile!\n");
......@@ -1114,7 +1114,7 @@ srv_read_init_val(
}
printf(
"Error in Innobase booting: could not read first value after %s\n",
"Error in InnoDB booting: could not read first value after %s\n",
keyword);
printf("from the initfile!\n");
......@@ -1140,7 +1140,7 @@ srv_read_init_val(
}
printf(
"Error in Innobase booting: could not read second value after %s\n",
"Error in InnoDB booting: could not read second value after %s\n",
keyword);
printf("from the initfile!\n");
......@@ -1156,7 +1156,7 @@ srv_read_init_val(
}
printf(
"Error in Innobase booting: numerical value too big after %s\n",
"Error in InnoDB booting: numerical value too big after %s\n",
keyword);
printf("in the initfile!\n");
......@@ -1173,7 +1173,7 @@ srv_read_init_val(
}
printf(
"Error in Innobase booting: numerical value too big after %s\n",
"Error in InnoDB booting: numerical value too big after %s\n",
keyword);
printf("in the initfile!\n");
......@@ -1523,7 +1523,7 @@ srv_general_init(void)
}
/*************************************************************************
Normalizes init parameter values to use units we use inside Innobase. */
Normalizes init parameter values to use units we use inside InnoDB. */
static
ulint
srv_normalize_init_values(void)
......@@ -1552,7 +1552,7 @@ srv_normalize_init_values(void)
}
/*************************************************************************
Boots the Innobase server. */
Boots the InnoDB server. */
ulint
srv_boot(void)
......@@ -1562,7 +1562,7 @@ srv_boot(void)
ulint err;
/* Transform the init parameter values given by MySQL to
use units we use inside Innobase: */
use units we use inside InnoDB: */
err = srv_normalize_init_values();
......@@ -1797,7 +1797,7 @@ srv_lock_timeout_monitor_thread(
}
/***********************************************************************
Tells the Innobase server that there has been activity in the database
Tells the InnoDB server that there has been activity in the database
and wakes up the master thread if it is suspended (not sleeping). Used
in the MySQL interface. Note that there is a small chance that the master
thread stays suspended (we do not protect our operation with the kernel
......
innobase/srv/srv0start.c
View file @ fc6dcf4d
/************************************************************************
Starts the Innobase database server
Starts the InnoDB database server
(c) 1996-2000 Innobase Oy
(c) 1996-2000 InnoDB Oy
Created 2/16/1996 Heikki Tuuri
*************************************************************************/
......@@ -207,7 +207,7 @@ open_or_create_log_file(
if (ret == FALSE) {
if (os_file_get_last_error() != OS_FILE_ALREADY_EXISTS) {
fprintf(stderr,
"Innobase: Error in creating or opening %s\n", name);
"InnoDB: Error in creating or opening %s\n", name);
return(DB_ERROR);
}
......@@ -216,7 +216,7 @@ open_or_create_log_file(
name, OS_FILE_OPEN, OS_FILE_AIO, &ret);
if (!ret) {
fprintf(stderr,
"Innobase: Error in opening %s\n", name);
"InnoDB: Error in opening %s\n", name);
return(DB_ERROR);
}
......@@ -227,8 +227,8 @@ open_or_create_log_file(
if (size != UNIV_PAGE_SIZE * srv_log_file_size
|| size_high != 0) {
fprintf(stderr,
"Innobase: Error: log file %s is of different size\n"
"Innobase: than specified in the .cnf file!\n", name);
"InnoDB: Error: log file %s is of different size\n"
"InnoDB: than specified in the .cnf file!\n", name);
return(DB_ERROR);
}
......@@ -236,16 +236,16 @@ open_or_create_log_file(
*log_file_created = TRUE;
fprintf(stderr,
"Innobase: Log file %s did not exist: new to be created\n",
"InnoDB: Log file %s did not exist: new to be created\n",
name);
printf("Innobase: Setting log file %s size to %lu\n",
printf("InnoDB: Setting log file %s size to %lu\n",
name, UNIV_PAGE_SIZE * srv_log_file_size);
ret = os_file_set_size(name, files[i],
UNIV_PAGE_SIZE * srv_log_file_size, 0);
if (!ret) {
fprintf(stderr,
"Innobase: Error in creating %s: probably out of disk space\n",
"InnoDB: Error in creating %s: probably out of disk space\n",
name);
return(DB_ERROR);
......@@ -335,7 +335,7 @@ open_or_create_data_files(
if (os_file_get_last_error() !=
OS_FILE_ALREADY_EXISTS) {
fprintf(stderr,
"Innobase: Error in creating or opening %s\n",
"InnoDB: Error in creating or opening %s\n",
name);
return(DB_ERROR);
......@@ -343,9 +343,9 @@ open_or_create_data_files(
if (one_created) {
fprintf(stderr,
"Innobase: Error: data files can only be added at the end\n");
"InnoDB: Error: data files can only be added at the end\n");
fprintf(stderr,
"Innobase: of a tablespace, but data file %s existed beforehand.\n",
"InnoDB: of a tablespace, but data file %s existed beforehand.\n",
name);
return(DB_ERROR);
}
......@@ -355,7 +355,7 @@ open_or_create_data_files(
if (!ret) {
fprintf(stderr,
"Innobase: Error in opening %s\n", name);
"InnoDB: Error in opening %s\n", name);
return(DB_ERROR);
}
......@@ -366,8 +366,8 @@ open_or_create_data_files(
if (size != UNIV_PAGE_SIZE * srv_data_file_sizes[i]
|| size_high != 0) {
fprintf(stderr,
"Innobase: Error: data file %s is of different size\n"
"Innobase: than specified in the .cnf file!\n", name);
"InnoDB: Error: data file %s is of different size\n"
"InnoDB: than specified in the .cnf file!\n", name);
return(DB_ERROR);
}
......@@ -382,26 +382,26 @@ open_or_create_data_files(
if (i > 0) {
fprintf(stderr,
"Innobase: Data file %s did not exist: new to be created\n", name);
"InnoDB: Data file %s did not exist: new to be created\n", name);
} else {
fprintf(stderr,
"Innobase: The first specified data file %s did not exist:\n"
"Innobase: a new database to be created!\n", name);
"InnoDB: The first specified data file %s did not exist:\n"
"InnoDB: a new database to be created!\n", name);
*create_new_db = TRUE;
}
printf("Innobase: Setting file %s size to %lu\n",
printf("InnoDB: Setting file %s size to %lu\n",
name, UNIV_PAGE_SIZE * srv_data_file_sizes[i]);
printf(
"Innobase: Database physically writes the file full: wait...\n");
"InnoDB: Database physically writes the file full: wait...\n");
ret = os_file_set_size(name, files[i],
UNIV_PAGE_SIZE * srv_data_file_sizes[i], 0);
if (!ret) {
fprintf(stderr,
"Innobase: Error in creating %s: probably out of disk space\n", name);
"InnoDB: Error in creating %s: probably out of disk space\n", name);
return(DB_ERROR);
}
......@@ -503,7 +503,7 @@ test_measure_cont(
}
/********************************************************************
Starts Innobase and creates a new database if database files
Starts InnoDB and creates a new database if database files
are not found and the user wants. Server parameters are
read from a file of name "srv_init" in the ib_home directory. */
......@@ -606,7 +606,7 @@ innobase_start_or_create_for_mysql(void)
&sum_of_new_sizes);
if (err != DB_SUCCESS) {
fprintf(stderr, "Innobase: Could not open data files\n");
fprintf(stderr, "InnoDB: Could not open data files\n");
return((int) err);
}
......@@ -634,12 +634,12 @@ innobase_start_or_create_for_mysql(void)
if ((log_opened && create_new_db)
|| (log_opened && log_created)) {
fprintf(stderr,
"Innobase: Error: all log files must be created at the same time.\n"
"Innobase: If you want bigger or smaller log files,\n"
"Innobase: shut down the database and make sure there\n"
"Innobase: were no errors in shutdown.\n"
"Innobase: Then delete the existing log files. Edit the .cnf file\n"
"Innobase: and start the database again.\n");
"InnoDB: Error: all log files must be created at the same time.\n"
"InnoDB: If you want bigger or smaller log files,\n"
"InnoDB: shut down the database and make sure there\n"
"InnoDB: were no errors in shutdown.\n"
"InnoDB: Then delete the existing log files. Edit the .cnf file\n"
"InnoDB: and start the database again.\n");
return(DB_ERROR);
}
......@@ -652,9 +652,9 @@ innobase_start_or_create_for_mysql(void)
if (ut_dulint_cmp(max_flushed_lsn, min_flushed_lsn) != 0
|| max_arch_log_no != min_arch_log_no) {
fprintf(stderr,
"Innobase: Cannot initialize created log files because\n"
"Innobase: data files were not in sync with each other\n"
"Innobase: or the data files are corrupt./n");
"InnoDB: Cannot initialize created log files because\n"
"InnoDB: data files were not in sync with each other\n"
"InnoDB: or the data files are corrupt./n");
return(DB_ERROR);
}
......@@ -662,11 +662,11 @@ innobase_start_or_create_for_mysql(void)
if (ut_dulint_cmp(max_flushed_lsn, ut_dulint_create(0, 1000))
< 0) {
fprintf(stderr,
"Innobase: Cannot initialize created log files because\n"
"Innobase: data files are corrupt, or new data files were\n"
"Innobase: created when the database was started previous\n"
"Innobase: time but the database was not shut down\n"
"Innobase: normally after that.\n");
"InnoDB: Cannot initialize created log files because\n"
"InnoDB: data files are corrupt, or new data files were\n"
"InnoDB: created when the database was started previous\n"
"InnoDB: time but the database was not shut down\n"
"InnoDB: normally after that.\n");
return(DB_ERROR);
}
......@@ -694,7 +694,7 @@ innobase_start_or_create_for_mysql(void)
} else if (srv_archive_recovery) {
fprintf(stderr,
"Innobase: Starting archive recovery from a backup...\n");
"InnoDB: Starting archive recovery from a backup...\n");
err = recv_recovery_from_archive_start(
min_flushed_lsn,
......@@ -776,7 +776,7 @@ innobase_start_or_create_for_mysql(void)
/* Create the thread which watches the timeouts for lock waits */
os_thread_create(&srv_lock_timeout_monitor_thread, NULL,
thread_ids + 2 + SRV_MAX_N_IO_THREADS);
fprintf(stderr, "Innobase: Started\n");
fprintf(stderr, "InnoDB: Started\n");
srv_was_started = TRUE;
srv_is_being_started = FALSE;
......@@ -789,7 +789,7 @@ innobase_start_or_create_for_mysql(void)
}
/********************************************************************
Shuts down the Innobase database. */
Shuts down the InnoDB database. */
int
innobase_shutdown_for_mysql(void)
......@@ -799,7 +799,7 @@ innobase_shutdown_for_mysql(void)
if (!srv_was_started) {
if (srv_is_being_started) {
fprintf(stderr,
"Innobase: Warning: shutting down not properly started database\n");
"InnoDB: Warning: shutting down not properly started database\n");
}
return(DB_SUCCESS);
}
......
sql/ha_innobase.cc
View file @ fc6dcf4d
This diff is collapsed.
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