Commit fcb6f9a4 authored by unknown's avatar unknown
Browse files

Merge heikki@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/heikki/mysql-4.0
parents 750f6193 6ca65795

innobase/row/row0mysql.c

+24 −0
Original line number Diff line number Diff line
@@ -2630,6 +2630,30 @@ row_rename_table_for_mysql( 
				ut_print_name(stderr, new_name);

				fputs("\n"

     "InnoDB: has or is referenced in foreign key constraints\n"

     "InnoDB: which are not compatible with the new table definition.\n",

					stderr);

     

				ut_a(dict_table_rename_in_cache(table,

							old_name, FALSE));

						

				trx->error_state = DB_SUCCESS;

				trx_general_rollback_for_mysql(trx, FALSE,

									NULL);

				trx->error_state = DB_SUCCESS;

			}

		} else {

			err = dict_load_foreigns(new_name);



			if (err != DB_SUCCESS) {



	    			ut_print_timestamp(stderr);



				fputs(

				"  InnoDB: Error: in RENAME TABLE table ",

					stderr);

				ut_print_name(stderr, new_name);

				fputs("\n"

     "InnoDB: is referenced in foreign key constraints\n"

     "InnoDB: which are not compatible with the new table definition.\n",

					stderr);