Commit f8d44429 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

srv0srv.h, srv0srv.c, row0mysql.c: 

  Put back a change unintentionally removed in the last 2 pushes
parent 55807d95

innobase/include/srv0srv.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern ulint srv_n_log_files; 
extern ulint	srv_log_file_size;

extern ibool	srv_log_archive_on;

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

					character set */

innobase/row/row0mysql.c

+2 −2
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ row_create_table_for_mysql( 
	ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());

	ut_ad(mutex_own(&(dict_sys->mutex)));

	

	if (srv_created_new_raw || srv_force_recovery) {

	if (srv_created_new_raw) {

		fprintf(stderr,

		"InnoDB: A new raw disk partition was initialized or\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_a(name != NULL);



	if (srv_created_new_raw || srv_force_recovery) {

	if (srv_created_new_raw) {

		fprintf(stderr,

		"InnoDB: A new raw disk partition was initialized or\n"

		"InnoDB: innodb_force_recovery is on: we do not allow\n"

innobase/srv/srv0srv.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ char** srv_log_group_home_dirs = NULL; 
ulint	srv_n_log_groups	= ULINT_MAX;

ulint	srv_n_log_files		= ULINT_MAX;

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 */ 

ibool	srv_flush_log_at_trx_commit = TRUE;