Commit 3468780e authored by unknown's avatar unknown
Browse files

innodb r702 

innodb r719


innobase/btr/btr0btr.c:
  innodb r702
innobase/buf/buf0buf.c:
  innodb r702
innobase/dict/dict0dict.c:
  innodb r702
innobase/fil/fil0fil.c:
  innodb r702
innobase/fsp/fsp0fsp.c:
  innodb r702
innobase/include/btr0cur.ic:
  innodb r719
innobase/include/buf0buf.ic:
  innodb r702
innobase/log/log0log.c:
  innodb r702
innobase/log/log0recv.c:
  innodb r702
innobase/os/os0file.c:
  innodb r702
innobase/row/row0mysql.c:
  innodb r702
innobase/row/row0sel.c:
  innodb r702
innobase/srv/srv0start.c:
  innodb r702
innobase/ut/ut0dbg.c:
  innodb r702
sql/ha_innodb.cc:
  innodb r702
parent 5c8c2ab4

innobase/btr/btr0btr.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ btr_page_get_father_for_rec( 
		fputs(

"InnoDB: You should dump + drop + reimport the table to fix the\n"

"InnoDB: corruption. If the crash happens at the database startup, see\n"

"InnoDB: http://dev.mysql.com/doc/mysql/en/Forcing_recovery.html about\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html about\n"

"InnoDB: forcing recovery. Then dump + drop + reimport.\n", stderr);

	}

innobase/buf/buf0buf.c

+3 −2
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ buf_page_is_corrupted( 
"InnoDB: is in the future! Current system log sequence number %lu %lu.\n"

"InnoDB: Your database may be corrupt or you may have copied the InnoDB\n"

"InnoDB: tablespace but not the InnoDB log files. See\n"

"http://dev.mysql.com/doc/mysql/en/backing-up.html for more information.\n",

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n"

"InnoDB: for more information.\n",

		        (ulong) mach_read_from_4(read_buf + FIL_PAGE_OFFSET),

			(ulong) ut_dulint_get_high(

				mach_read_from_8(read_buf + FIL_PAGE_LSN)),
@@ -1867,7 +1868,7 @@ buf_page_io_complete( 
		"InnoDB: the corrupt table. You can use CHECK\n"

		"InnoDB: TABLE to scan your table for corruption.\n"

		"InnoDB: See also "

		"http://dev.mysql.com/doc/mysql/en/Forcing_recovery.html\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n"

		"InnoDB: about forcing recovery.\n", stderr);

			  

			if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {

innobase/dict/dict0dict.c

+5 −6
Original line number Diff line number Diff line
@@ -2228,8 +2228,8 @@ dict_foreign_error_report( 
	if (fk->foreign_index) {

		fputs("The index in the foreign key in table is ", file);

		ut_print_name(file, NULL, fk->foreign_index->name);

		fputs(

"\nSee http://dev.mysql.com/doc/mysql/en/InnoDB_foreign_key_constraints.html\n"

		fputs("\n"

"See http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html\n"

"for correct foreign key definition.\n",

		file);

	}
@@ -3131,7 +3131,7 @@ dict_create_foreign_constraints_low( 
		ut_print_name(ef, NULL, name);

		fprintf(ef, " where the columns appear\n"

"as the first columns. Constraint:\n%s\n"

"See http://dev.mysql.com/doc/mysql/en/InnoDB_foreign_key_constraints.html\n"

"See http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html\n"

"for correct foreign key definition.\n",

			start_of_latest_foreign);

		mutex_exit(&dict_foreign_err_mutex);
@@ -3399,7 +3399,7 @@ dict_create_foreign_constraints_low( 
"Note that the internal storage type of ENUM and SET changed in\n"

"tables created with >= InnoDB-4.1.12, and such columns in old tables\n"

"cannot be referenced by such columns in new tables.\n"

"See http://dev.mysql.com/doc/mysql/en/InnoDB_foreign_key_constraints.html\n"

"See http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html\n"

"for correct foreign key definition.\n",

				start_of_latest_foreign);

			mutex_exit(&dict_foreign_err_mutex);
@@ -4059,8 +4059,7 @@ dict_update_statistics_low( 
		fprintf(stderr,

			"  InnoDB: cannot calculate statistics for table %s\n"

"InnoDB: because the .ibd file is missing.  For help, please refer to\n"

"InnoDB: "

"http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n",

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n",

			table->name);



		return;

innobase/fil/fil0fil.c

+3 −6
Original line number Diff line number Diff line
@@ -2689,8 +2689,7 @@ fil_open_single_table_tablespace( 
"InnoDB: It is also possible that this is a temporary table #sql...,\n"

"InnoDB: and MySQL removed the .ibd file for this.\n"

"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

"InnoDB: for how to resolve the issue.\n", stderr);



		mem_free(filepath);
@@ -2729,8 +2728,7 @@ fil_open_single_table_tablespace( 
"InnoDB: Have you moved InnoDB .ibd files around without using the\n"

"InnoDB: commands DISCARD TABLESPACE and IMPORT TABLESPACE?\n"

"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

"InnoDB: for how to resolve the issue.\n", (ulong) space_id, (ulong) id);



		ret = FALSE;
@@ -3375,8 +3373,7 @@ fil_space_for_table_exists_in_mem( 
	error_exit:

		fputs(

"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

"InnoDB: for how to resolve the issue.\n", stderr);



		mem_free(path);

innobase/fsp/fsp0fsp.c

+1 −1
Original line number Diff line number Diff line
@@ -2975,7 +2975,7 @@ fseg_free_page_low( 
	crash:

		fputs(

"InnoDB: Please refer to\n"

"InnoDB: http://dev.mysql.com/doc/mysql/en/Forcing_recovery.html\n"

"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n"

"InnoDB: about forcing recovery.\n", stderr);

		ut_error;

	}