Commit f63123f5 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
parents c251e8a8 f40b6c27

client/mysqltest.c

+0 −3
Original line number Diff line number Diff line
@@ -4957,9 +4957,6 @@ int main(int argc, char **argv) 
    die("No queries executed but result file found!");

  }





  dynstr_free(&ds_res);



  if (!got_end_timer)

    timer_output();				/* No end_timer cmd, end it */

  free_used_memory();

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ extern "C" { 
/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



#define FN_LIBCHAR '\\'

#define FN_ROOTDIR "\\"

#define FN_DEVCHAR ':'



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"

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;