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

row0mysql.c, ha_innobase.cc: 

  Improved error message for out-of-sync frm files
parent 4bdaf9c2

innobase/row/row0mysql.c

+9 −3
Original line number Diff line number Diff line
@@ -1348,7 +1348,9 @@ row_create_table_for_mysql( 
     "InnoDB: creating an InnoDB table with the same name in another\n"

     "InnoDB: database and moving the .frm file to the current database.\n"

     "InnoDB: Then MySQL thinks the table exists, and DROP TABLE will\n"

     "InnoDB: succeed.\n");

     "InnoDB: succeed.\n"

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

     "InnoDB: http://www.innodb.com/ibman.html\n");

		}



		trx->error_state = DB_SUCCESS;
@@ -1867,7 +1869,9 @@ row_drop_table_for_mysql( 
     	"  InnoDB: Error: table %s does not exist in the InnoDB internal\n"

     	"InnoDB: data dictionary though MySQL is trying to drop it.\n"

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

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

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

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

        "InnoDB: http://www.innodb.com/ibman.html\n",

				 name);

		goto funct_exit;

	}
@@ -2189,7 +2193,9 @@ row_rename_table_for_mysql( 
			fprintf(stderr,

     "  InnoDB: Error: table %s exists in the InnoDB internal data\n"

     "InnoDB: dictionary though MySQL is trying rename table %s to it.\n"

     "InnoDB: Have you deleted the .frm file and not used DROP TABLE?\n",

     "InnoDB: Have you deleted the .frm file and not used DROP TABLE?\n"

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

     "InnoDB: http://www.innodb.com/ibman.html\n",

			new_name, old_name);



			fprintf(stderr,

sql/ha_innobase.cc

+3 −1
Original line number Diff line number Diff line
@@ -971,7 +971,9 @@ Cannot find table %s from the internal data dictionary\n\ 
of InnoDB though the .frm file for the table exists. Maybe you\n\

have deleted and recreated InnoDB data files but have forgotten\n\

to delete the corresponding .frm files of InnoDB tables, or you\n\

have moved .frm files to another database?",

have moved .frm files to another database?\n\

Look from section 15.1 of http://www.innodb.com/ibman.html\n\

how you can resolve the problem.\n",

			  norm_name);



	        free_share(share);