mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
srv0srv.h, srv0srv.c, row0mysql.c:
Put back a change unintentionally removed in the last 2 pushes innobase/row/row0mysql.c: Put back a change unintentionally removed in the last 2 pushes innobase/srv/srv0srv.c: Put back a change unintentionally removed in the last 2 pushes innobase/include/srv0srv.h: Put back a change unintentionally removed in the last 2 pushes
This commit is contained in:
@ -53,7 +53,7 @@ extern ulint srv_n_log_files;
|
|||||||
extern ulint srv_log_file_size;
|
extern ulint srv_log_file_size;
|
||||||
extern ibool srv_log_archive_on;
|
extern ibool srv_log_archive_on;
|
||||||
extern ulint srv_log_buffer_size;
|
extern ulint srv_log_buffer_size;
|
||||||
extern ibool srv_flush_log_at_trx_commit;
|
extern ulint srv_flush_log_at_trx_commit;
|
||||||
|
|
||||||
extern byte srv_latin1_ordering[256];/* The sort order table of the latin1
|
extern byte srv_latin1_ordering[256];/* The sort order table of the latin1
|
||||||
character set */
|
character set */
|
||||||
|
@ -1186,7 +1186,7 @@ row_create_table_for_mysql(
|
|||||||
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
||||||
ut_ad(mutex_own(&(dict_sys->mutex)));
|
ut_ad(mutex_own(&(dict_sys->mutex)));
|
||||||
|
|
||||||
if (srv_created_new_raw || srv_force_recovery) {
|
if (srv_created_new_raw) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"InnoDB: A new raw disk partition was initialized or\n"
|
"InnoDB: A new raw disk partition was initialized or\n"
|
||||||
"InnoDB: innodb_force_recovery is on: we do not allow\n"
|
"InnoDB: innodb_force_recovery is on: we do not allow\n"
|
||||||
@ -1707,7 +1707,7 @@ row_drop_table_for_mysql(
|
|||||||
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
||||||
ut_a(name != NULL);
|
ut_a(name != NULL);
|
||||||
|
|
||||||
if (srv_created_new_raw || srv_force_recovery) {
|
if (srv_created_new_raw) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"InnoDB: A new raw disk partition was initialized or\n"
|
"InnoDB: A new raw disk partition was initialized or\n"
|
||||||
"InnoDB: innodb_force_recovery is on: we do not allow\n"
|
"InnoDB: innodb_force_recovery is on: we do not allow\n"
|
||||||
|
@ -94,7 +94,7 @@ char** srv_log_group_home_dirs = NULL;
|
|||||||
ulint srv_n_log_groups = ULINT_MAX;
|
ulint srv_n_log_groups = ULINT_MAX;
|
||||||
ulint srv_n_log_files = ULINT_MAX;
|
ulint srv_n_log_files = ULINT_MAX;
|
||||||
ulint srv_log_file_size = ULINT_MAX; /* size in database pages */
|
ulint srv_log_file_size = ULINT_MAX; /* size in database pages */
|
||||||
ibool srv_log_archive_on = TRUE;
|
ulint srv_log_archive_on = 1;
|
||||||
ulint srv_log_buffer_size = ULINT_MAX; /* size in database pages */
|
ulint srv_log_buffer_size = ULINT_MAX; /* size in database pages */
|
||||||
ibool srv_flush_log_at_trx_commit = TRUE;
|
ibool srv_flush_log_at_trx_commit = TRUE;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user