Commit 511e8845 authored by unknown's avatar unknown
Browse files

Merge 127.(none):/home/osku/mysql/5.0/clean 

into  127.(none):/home/osku/mysql/5.0/12084
parents 027476e5 d17b361e

innobase/dict/dict0dict.c

+23 −3
Original line number Diff line number Diff line
@@ -2871,8 +2871,12 @@ dict_create_foreign_constraints_low( 
				table2 can be written also with the database

				name before it: test.table2; the default

				database is the database of parameter name */

	const char*	name)	/* in: table full name in the normalized form

	const char*	name,	/* in: table full name in the normalized form

				database_name/table_name */

	ibool		reject_fks)

				/* in: if TRUE, fail with error code

				DB_CANNOT_ADD_CONSTRAINT if any foreign

				keys are found. */

{

	dict_table_t*	table;

	dict_table_t*	referenced_table;
@@ -2994,6 +2998,18 @@ dict_create_foreign_constraints_low( 
	}



	if (*ptr == '\0') {

		/* The proper way to reject foreign keys for temporary

		   tables would be to split the lexing and syntactical

		   analysis of foreign key clauses from the actual adding

		   of them, so that ha_innodb.cc could first parse the SQL

		   command, determine if there are any foreign keys, and

		   if so, immediately reject the command if the table is a

		   temporary one. For now, this kludge will work. */

		if (reject_fks && (UT_LIST_GET_LEN(table->foreign_list) > 0))

		{

			return DB_CANNOT_ADD_CONSTRAINT;

		}

		

		/**********************************************************/

		/* The following call adds the foreign key constraints

		to the data dictionary system tables on disk */
@@ -3417,9 +3433,12 @@ dict_create_foreign_constraints( 
					name before it: test.table2; the

					default database id the database of

					parameter name */

	const char*	name)		/* in: table full name in the

	const char*	name,		/* in: table full name in the

					normalized form

					database_name/table_name */

	ibool		reject_fks)	/* in: if TRUE, fail with error

					code DB_CANNOT_ADD_CONSTRAINT if

					any foreign keys are found. */

{

	char*		str;

	ulint		err;
@@ -3428,7 +3447,8 @@ dict_create_foreign_constraints( 
	str = dict_strip_comments(sql_string);

	heap = mem_heap_create(10000);



	err = dict_create_foreign_constraints_low(trx, heap, str, name);

	err = dict_create_foreign_constraints_low(trx, heap, str, name,

		reject_fks);



	mem_heap_free(heap);

	mem_free(str);

innobase/include/dict0dict.h

+4 −1
Original line number Diff line number Diff line
@@ -228,9 +228,12 @@ dict_create_foreign_constraints( 
					name before it: test.table2; the

					default database id the database of

					parameter name */

	const char*	name);		/* in: table full name in the

	const char*	name,		/* in: table full name in the

					normalized form

					database_name/table_name */

	ibool		reject_fks);	/* in: if TRUE, fail with error

					code DB_CANNOT_ADD_CONSTRAINT if

					any foreign keys are found. */

/**************************************************************************

Parses the CONSTRAINT id's to be dropped in an ALTER TABLE statement. */

innobase/include/row0mysql.h

+5 −1
Original line number Diff line number Diff line
@@ -355,9 +355,13 @@ row_table_add_foreign_constraints( 
				FOREIGN KEY (a, b) REFERENCES table2(c, d),

					table2 can be written also with the

					database name before it: test.table2 */

	const char*	name);		/* in: table full name in the

	const char*	name,		/* in: table full name in the

					normalized form

					database_name/table_name */

	ibool		reject_fks);	/* in: if TRUE, fail with error

					code DB_CANNOT_ADD_CONSTRAINT if

					any foreign keys are found. */



/*************************************************************************

The master thread in srv0srv.c calls this regularly to drop tables which

we must drop in background after queries to them have ended. Such lazy

innobase/row/row0mysql.c

+6 −2
Original line number Diff line number Diff line
@@ -2088,9 +2088,12 @@ row_table_add_foreign_constraints( 
				FOREIGN KEY (a, b) REFERENCES table2(c, d),

					table2 can be written also with the

					database name before it: test.table2 */

	const char*	name)		/* in: table full name in the

	const char*	name,		/* in: table full name in the

					normalized form

					database_name/table_name */

	ibool		reject_fks)	/* in: if TRUE, fail with error

					code DB_CANNOT_ADD_CONSTRAINT if

					any foreign keys are found. */

{

	ulint	err;
@@ -2111,7 +2114,8 @@ row_table_add_foreign_constraints( 


	trx->dict_operation = TRUE;



	err = dict_create_foreign_constraints(trx, sql_string, name);

	err = dict_create_foreign_constraints(trx, sql_string, name,

		reject_fks);



	if (err == DB_SUCCESS) {

		/* Check that also referencing constraints are ok */

mysql-test/r/innodb.result

+12 −0
Original line number Diff line number Diff line
@@ -2527,3 +2527,15 @@ SELECT * FROM t1; 
id

1

DROP TABLE t2, t1;

CREATE TABLE t1

(

id INT PRIMARY KEY

) ENGINE=InnoDB;

CREATE TEMPORARY TABLE t2

(

id INT NOT NULL PRIMARY KEY,

b INT,

FOREIGN KEY (b) REFERENCES test.t1(id)

) ENGINE=InnoDB;

Got one of the listed errors

DROP TABLE t1;