Commit 53ffcff7 authored by unknown's avatar unknown
Browse files

row0mysql.c: 

  Correct web links
fil0fil.c:
  Correct (?) English grammar


innobase/fil/fil0fil.c:
  Correct (?) English grammar
innobase/row/row0mysql.c:
  Correct web links
parent a569b083

innobase/fil/fil0fil.c

+7 −7
Original line number Diff line number Diff line
@@ -2621,12 +2621,12 @@ fil_open_single_table_tablespace( 
		fputs("!\n"

"InnoDB: Have you moved InnoDB .ibd files around without using the\n"

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

"InnoDB: It is also possible that this is a table created with\n"

"InnoDB: CREATE TEMPORARY TABLE, and MySQL removed the .ibd file for this.\n"

"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: how to resolve the issue.\n", stderr);

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



		mem_free(filepath);
@@ -2666,7 +2666,7 @@ fil_open_single_table_tablespace( 
"InnoDB: Please refer to\n"

"InnoDB:"

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

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

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



		ret = FALSE;
@@ -3261,7 +3261,7 @@ fil_space_for_table_exists_in_mem( 
			ut_print_filename(stderr, name);

			fprintf(stderr, "\n"

"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"

"InnoDB: but tablespace with that id does not exist. There is\n"

"InnoDB: but a tablespace with that id does not exist. There is\n"

"InnoDB: a tablespace of name %s and id %lu, though. Have\n"

"InnoDB: you deleted or moved .ibd files?\n",

				(ulong) id, namespace->name,
@@ -3272,7 +3272,7 @@ fil_space_for_table_exists_in_mem( 
"InnoDB: Please refer to\n"

"InnoDB:"

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

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

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



		mem_free(path);

		mutex_exit(&(system->mutex));
@@ -3286,7 +3286,7 @@ fil_space_for_table_exists_in_mem( 
		ut_print_filename(stderr, name);

		fprintf(stderr, "\n"

"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"

"InnoDB: but tablespace with that id has name %s.\n"

"InnoDB: but the tablespace with that id has name %s.\n"

"InnoDB: Have you deleted or moved .ibd files?\n", (ulong) id, space->name);



		if (namespace != NULL) {

innobase/row/row0mysql.c

+6 −4
Original line number Diff line number Diff line
@@ -3382,8 +3382,9 @@ row_rename_table_for_mysql( 
     	"InnoDB: data dictionary though MySQL is trying to rename the table.\n"

     	"InnoDB: Have you copied the .frm file of the table to the\n"

	"InnoDB: MySQL database directory from another database?\n"

	"InnoDB: You can look for further help from section 15.1 of\n"

        "InnoDB: http://www.innodb.com/ibman.php\n", stderr);

	"InnoDB: You can look for further help from\n"

        "InnoDB: http://dev.mysql.com/doc/mysql/en/"

	"InnoDB_troubleshooting_datadict.html\n", stderr);

		goto funct_exit;

	}
@@ -3395,8 +3396,9 @@ row_rename_table_for_mysql( 
                ut_print_name(stderr, trx, old_name);

                fputs(

	" does not have an .ibd file in the database directory.\n"

	"InnoDB: You can look for further help from section 15.1 of\n"

        "InnoDB: http://www.innodb.com/ibman.php\n", stderr);

	"InnoDB: You can look for further help from\n"

        "InnoDB: http://dev.mysql.com/doc/mysql/en/"

	"InnoDB_troubleshooting_datadict.html\n", stderr);

		goto funct_exit;

	}