Merge lp:~vkolesnikov/pbxt/pbxt-bug-378222 into lp:pbxt

[Vladimir Kolesnikov]

[Paul McCullagh (paul-mccullagh)]

Hi Vlad,

This patch looks good. Just one thing: how about doing this in
xt_tab_init_db()?

I think this would be more efficient.

On Jun 12, 2009, at 4:40 PM, Vladimir Kolesnikov wrote:

> === modified file 'src/database_xt.cc'
> --- src/database_xt.cc 2009-05-28 15:17:16 +0000
> +++ src/database_xt.cc 2009-06-12 14:29:30 +0000
> @@ -616,7 +616,9 @@
> xtPublic void xt_open_database(XTThreadPtr self, char *path, xtBool
> multi_path)
> {
> XTDatabaseHPtr db;
> -
> + XTTableDescRec desc;
> + XTPathStr table_path;
> +
> /* We cannot get a database, without unusing the current
> * first. The reason is that the restart process will
> * partially set the current database!
> @@ -625,7 +627,18 @@
> db = xt_get_database(self, path, multi_path);
> pushr_(xt_heap_release, db);
> xt_use_database(self, db, XT_FOR_USER);
> - freer_(); // xt_heap_release(self, db);
> +
> + xt_describe_tables_init(self, db, &desc);
> + pushr_(xt_describe_tables_exit, &desc);
> + while (xt_describe_tables_next(self, &desc)) {
> + xt_strcpy(PATH_MAX, table_path.ps_path, desc.td_tab_path->tp_path);
> + xt_add_dir_char(PATH_MAX, table_path.ps_path);
> + xt_strcat(PATH_MAX, table_path.ps_path, desc.td_tab_name);
> + xt_heap_release(self, xt_use_table(self, &table_path, FALSE,
> FALSE, NULL));
> + }
> +
> + freer_(); // xt_describe_tables_exit(self, desc);
> + freer_(); // xt_heap_release(self, db);
> }
>

--
Paul McCullagh
PrimeBase Technologies
www.primebase.org
www.blobstreaming.org
pbxt.blogspot.com

[Vladimir Kolesnikov (vkolesnikov)]

This was my first idea too, but xt_use_table requires self->st_database
to be inited which is done in xt_ue_database() so I put this code right
after the call to xt_use_database (and xt_use_database itself doesn't
seem to be good place too). Of course I can copy some code from
xt_use_database and put it before the use_table but I thought it's not a
good idea.

Paul McCullagh wrote:
> Hi Vlad,
>
> This patch looks good. Just one thing: how about doing this in
> xt_tab_init_db()?
>
> I think this would be more efficient.
>
> On Jun 12, 2009, at 4:40 PM, Vladimir Kolesnikov wrote:
>
>
>> === modified file 'src/database_xt.cc'
>> --- src/database_xt.cc 2009-05-28 15:17:16 +0000
>> +++ src/database_xt.cc 2009-06-12 14:29:30 +0000
>> @@ -616,7 +616,9 @@
>> xtPublic void xt_open_database(XTThreadPtr self, char *path, xtBool
>> multi_path)
>> {
>> XTDatabaseHPtr db;
>> -
>> + XTTableDescRec desc;
>> + XTPathStr table_path;
>> +
>> /* We cannot get a database, without unusing the current
>> * first. The reason is that the restart process will
>> * partially set the current database!
>> @@ -625,7 +627,18 @@
>> db = xt_get_database(self, path, multi_path);
>> pushr_(xt_heap_release, db);
>> xt_use_database(self, db, XT_FOR_USER);
>> - freer_(); // xt_heap_release(self, db);
>> +
>> + xt_describe_tables_init(self, db, &desc);
>> + pushr_(xt_describe_tables_exit, &desc);
>> + while (xt_describe_tables_next(self, &desc)) {
>> + xt_strcpy(PATH_MAX, table_path.ps_path, desc.td_tab_path->tp_path);
>> + xt_add_dir_char(PATH_MAX, table_path.ps_path);
>> + xt_strcat(PATH_MAX, table_path.ps_path, desc.td_tab_name);
>> + xt_heap_release(self, xt_use_table(self, &table_path, FALSE,
>> FALSE, NULL));
>> + }
>> +
>> + freer_(); // xt_describe_tables_exit(self, desc);
>> + freer_(); // xt_heap_release(self, db);
>> }
>>
>>
>
>
>
> --
> Paul McCullagh
> PrimeBase Technologies
> www.primebase.org
> www.blobstreaming.org
> pbxt.blogspot.com
>
>
>
>

--
--
Best Regards,
Vladimir

[Paul McCullagh (paul-mccullagh)]

I think you could try: xt_use_table_no_lock()

Because lock on db->db_tables is not required anyway.

On Jun 16, 2009, at 12:18 PM, Vladimir Kolesnikov wrote:

> This was my first idea too, but xt_use_table requires self-
> >st_database
> to be inited which is done in xt_ue_database() so I put this code
> right
> after the call to xt_use_database (and xt_use_database itself doesn't
> seem to be good place too). Of course I can copy some code from
> xt_use_database and put it before the use_table but I thought it's
> not a
> good idea.
>
> Paul McCullagh wrote:
>> Hi Vlad,
>>
>> This patch looks good. Just one thing: how about doing this in
>> xt_tab_init_db()?
>>
>> I think this would be more efficient.
>>
>> On Jun 12, 2009, at 4:40 PM, Vladimir Kolesnikov wrote:
>>
>>
>>> === modified file 'src/database_xt.cc'
>>> --- src/database_xt.cc 2009-05-28 15:17:16 +0000
>>> +++ src/database_xt.cc 2009-06-12 14:29:30 +0000
>>> @@ -616,7 +616,9 @@
>>> xtPublic void xt_open_database(XTThreadPtr self, char *path, xtBool
>>> multi_path)
>>> {
>>> XTDatabaseHPtr db;
>>> -
>>> + XTTableDescRec desc;
>>> + XTPathStr table_path;
>>> +
>>> /* We cannot get a database, without unusing the current
>>> * first. The reason is that the restart process will
>>> * partially set the current database!
>>> @@ -625,7 +627,18 @@
>>> db = xt_get_database(self, path, multi_path);
>>> pushr_(xt_heap_release, db);
>>> xt_use_database(self, db, XT_FOR_USER);
>>> - freer_(); // xt_heap_release(self, db);
>>> +
>>> + xt_describe_tables_init(self, db, &desc);
>>> + pushr_(xt_describe_tables_exit, &desc);
>>> + while (xt_describe_tables_next(self, &desc)) {
>>> + xt_strcpy(PATH_MAX, table_path.ps_path, desc.td_tab_path-
>>> >tp_path);
>>> + xt_add_dir_char(PATH_MAX, table_path.ps_path);
>>> + xt_strcat(PATH_MAX, table_path.ps_path, desc.td_tab_name);
>>> + xt_heap_release(self, xt_use_table(self, &table_path, FALSE,
>>> FALSE, NULL));
>>> + }
>>> +
>>> + freer_(); // xt_describe_tables_exit(self, desc);
>>> + freer_(); // xt_heap_release(self, db);
>>> }
>>>
>>>
>>
>>
>>
>> --
>> Paul McCullagh
>> PrimeBase Technologies
>> www.primebase.org
>> www.blobstreaming.org
>> pbxt.blogspot.com
>>
>>
>>
>>
>
>
> --
> --
> Best Regards,
> Vladimir
>
> https://code.launchpad.net/~vkolesnikov/pbxt/pbxt-bug-378222/+merge/
> 7376
> Your team PBXT Core is subscribed to branch lp:pbxt.

--
Paul McCullagh
PrimeBase Technologies
www.primebase.org
www.blobstreaming.org
pbxt.blogspot.com

[Vladimir Kolesnikov (vkolesnikov)]

pushed the change

Paul McCullagh wrote:
> I think you could try: xt_use_table_no_lock()
>
> Because lock on db->db_tables is not required anyway.
>
> On Jun 16, 2009, at 12:18 PM, Vladimir Kolesnikov wrote:
>
>
>> This was my first idea too, but xt_use_table requires self-
>>
>>> st_database
>>>
>> to be inited which is done in xt_ue_database() so I put this code
>> right
>> after the call to xt_use_database (and xt_use_database itself doesn't
>> seem to be good place too). Of course I can copy some code from
>> xt_use_database and put it before the use_table but I thought it's
>> not a
>> good idea.
>>
>> Paul McCullagh wrote:
>>
>>> Hi Vlad,
>>>
>>> This patch looks good. Just one thing: how about doing this in
>>> xt_tab_init_db()?
>>>
>>> I think this would be more efficient.
>>>
>>> On Jun 12, 2009, at 4:40 PM, Vladimir Kolesnikov wrote:
>>>
>>>
>>>
>>>> === modified file 'src/database_xt.cc'
>>>> --- src/database_xt.cc 2009-05-28 15:17:16 +0000
>>>> +++ src/database_xt.cc 2009-06-12 14:29:30 +0000
>>>> @@ -616,7 +616,9 @@
>>>> xtPublic void xt_open_database(XTThreadPtr self, char *path, xtBool
>>>> multi_path)
>>>> {
>>>> XTDatabaseHPtr db;
>>>> -
>>>> + XTTableDescRec desc;
>>>> + XTPathStr table_path;
>>>> +
>>>> /* We cannot get a database, without unusing the current
>>>> * first. The reason is that the restart process will
>>>> * partially set the current database!
>>>> @@ -625,7 +627,18 @@
>>>> db = xt_get_database(self, path, multi_path);
>>>> pushr_(xt_heap_release, db);
>>>> xt_use_database(self, db, XT_FOR_USER);
>>>> - freer_(); // xt_heap_release(self, db);
>>>> +
>>>> + xt_describe_tables_init(self, db, &desc);
>>>> + pushr_(xt_describe_tables_exit, &desc);
>>>> + while (xt_describe_tables_next(self, &desc)) {
>>>> + xt_strcpy(PATH_MAX, table_path.ps_path, desc.td_tab_path-
>>>>
>>>>> tp_path);
>>>>>
>>>> + xt_add_dir_char(PATH_MAX, table_path.ps_path);
>>>> + xt_strcat(PATH_MAX, table_path.ps_path, desc.td_tab_name);
>>>> + xt_heap_release(self, xt_use_table(self, &table_path, FALSE,
>>>> FALSE, NULL));
>>>> + }
>>>> +
>>>> + freer_(); // xt_describe_tables_exit(self, desc);
>>>> + freer_(); // xt_heap_release(self, db);
>>>> }
>>>>
>>>>
>>>>
>>>
>>> --
>>> Paul McCullagh
>>> PrimeBase Technologies
>>> www.primebase.org
>>> www.blobstreaming.org
>>> pbxt.blogspot.com
>>>
>>>
>>>
>>>
>>>
>> --
>> --
>> Best Regards,
>> Vladimir
>>
>> https://code.launchpad.net/~vkolesnikov/pbxt/pbxt-bug-378222/+merge/
>> 7376
>> Your team PBXT Core is subscribed to branch lp:pbxt.
>>
>
>
>
> --
> Paul McCullagh
> PrimeBase Technologies
> www.primebase.org
> www.blobstreaming.org
> pbxt.blogspot.com
>
>
>
>

--
--
Best Regards,
Vladimir

[lp:~vkolesnikov/pbxt/pbxt-bug-378222]

658. By Paul McCullagh on 2009-06-16

Merged RN246

=== modified file 'ChangeLog'
--- ChangeLog	2009-06-10 16:26:33 +0000
+++ ChangeLog	2009-06-12 14:29:30 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.08 RC - Not yet released
 
+RN246: Fixed bug #378222: Drop sakila causes error: Cannot delete or update a parent row: a foreign key constraint fails
+
 RN245: Fixed bug #379315: Inconsistent behavior of DELETE IGNORE and FK constraint
 
 RN244: Fixed a recovery problem: during the recovery of "record modified" action the table was updated before the old index entries were removed; then the xres_remove_index_entries was supplied the new record which lead to incorrect index update
 
=== modified file 'src/database_xt.cc'
--- src/database_xt.cc	2009-05-28 15:17:16 +0000
+++ src/database_xt.cc	2009-06-12 14:29:30 +0000
@@ -616,7 +616,9 @@
 xtPublic void xt_open_database(XTThreadPtr self, char *path, xtBool multi_path)
 {
 	XTDatabaseHPtr db;
-	
+	XTTableDescRec desc;
+	XTPathStr      table_path;
+
 	/* We cannot get a database, without unusing the current
 	 * first. The reason is that the restart process will
 	 * partially set the current database!
@@ -625,7 +627,18 @@
 	db = xt_get_database(self, path, multi_path);
 	pushr_(xt_heap_release, db);
 	xt_use_database(self, db, XT_FOR_USER);
-	freer_(); // xt_heap_release(self, db);	
+
+	xt_describe_tables_init(self, db, &desc);
+	pushr_(xt_describe_tables_exit, &desc);
+	while (xt_describe_tables_next(self, &desc)) {
+		xt_strcpy(PATH_MAX, table_path.ps_path, desc.td_tab_path->tp_path);
+		xt_add_dir_char(PATH_MAX, table_path.ps_path);
+		xt_strcat(PATH_MAX, table_path.ps_path, desc.td_tab_name);
+		xt_heap_release(self, xt_use_table(self, &table_path, FALSE, FALSE, NULL));
+	}
+
+	freer_();	// xt_describe_tables_exit(self, desc);
+	freer_();	// xt_heap_release(self, db);	
 }
 
 /* This function can only be called if you do not already have a database in
 
=== modified file 'src/datadic_xt.cc'
--- src/datadic_xt.cc	2009-05-19 15:22:26 +0000
+++ src/datadic_xt.cc	2009-06-12 14:29:30 +0000
@@ -650,7 +650,7 @@
 	int parseKeyAction(XTThreadPtr self);	
 	void parseCreateTable(XTThreadPtr self);
 	void parseAddTableItem(XTThreadPtr self);
-	void parseQualifiedName(XTThreadPtr self, char *name);
+	void parseQualifiedName(XTThreadPtr self, char *parent_name, char *name);
 	void parseTableName(XTThreadPtr self, bool alterTable);
 	void parseExpression(XTThreadPtr self, bool allow_reserved);
 	void parseBrackets(XTThreadPtr self);
@@ -720,7 +720,7 @@
 	}
 	virtual void addListedColumn(XTThreadPtr XT_UNUSED(self), char *XT_UNUSED(index_col_name)) {
 	}
-	virtual void setReferencedTable(XTThreadPtr XT_UNUSED(self), char *XT_UNUSED(ref_table)) {
+	virtual void setReferencedTable(XTThreadPtr XT_UNUSED(self), char *XT_UNUSED(ref_schema), char *XT_UNUSED(ref_table)) {
 	}
 	virtual void addReferencedColumn(XTThreadPtr XT_UNUSED(self), char *XT_UNUSED(index_col_name)) {
 	}
@@ -870,7 +870,7 @@
 	if (pt_current->isKeyWord("CONSTRAINT")) {
 		pt_current = pt_tokenizer->nextToken(self);
 		if (pt_current->isIdentifier())
-			parseQualifiedName(self, name);
+			parseQualifiedName(self, NULL, name);
 	}
 
 	if (pt_current->isReservedWord(XT_TK_PRIMARY)) {
@@ -985,13 +985,15 @@
 		char	name[XT_IDENTIFIER_NAME_SIZE];
 
 		pt_current = pt_tokenizer->nextToken(self);
-		parseQualifiedName(self, name);
+		parseQualifiedName(self, NULL, name);
 		moveColumn(self, name);
 	}
 }
 
-void XTParseTable::parseQualifiedName(XTThreadPtr self, char *name)
+void XTParseTable::parseQualifiedName(XTThreadPtr self, char *parent_name, char *name)
 {
+	if (parent_name)
+		parent_name[0] = '\0';
 	/* Should be an identifier by I have this example:
 	 * CREATE TABLE t1 ( comment CHAR(32) ASCII NOT NULL, koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL default '' ) CHARSET=latin5;
 	 *
@@ -1001,6 +1003,8 @@
 		raiseError(self, pt_current, XT_ERR_ID_TOO_LONG);
 	pt_current = pt_tokenizer->nextToken(self);
 	while (pt_current->isKeyWord(".")) {
+		if (parent_name)
+			xt_strcpy(XT_IDENTIFIER_NAME_SIZE,parent_name, name);
 		pt_current = pt_tokenizer->nextToken(self);
 		/* Accept anything after the DOT! */
 		if (pt_current->getString(name, XT_IDENTIFIER_NAME_SIZE) >= XT_IDENTIFIER_NAME_SIZE)
@@ -1013,7 +1017,7 @@
 {
 	char name[XT_IDENTIFIER_NAME_SIZE];
 
-	parseQualifiedName(self, name);
+	parseQualifiedName(self, NULL, name);
 	setTableName(self, name, alterTable);
 }
 
@@ -1022,7 +1026,7 @@
 	char col_name[XT_IDENTIFIER_NAME_SIZE];
 
 	// column_definition
-	parseQualifiedName(self, col_name);
+	parseQualifiedName(self, NULL, col_name);
 	addColumn(self, col_name, old_col_name);
 	parseDataType(self);
 
@@ -1122,7 +1126,7 @@
 	pt_current->expectKeyWord(self, "(");
 	do {
 		pt_current = pt_tokenizer->nextToken(self);
-		parseQualifiedName(self, name);
+		parseQualifiedName(self, NULL, name);
 		addListedColumn(self, name);
 		cols++;
 		if (index_cols) {
@@ -1146,19 +1150,20 @@
 	int		on_delete = XT_KEY_ACTION_DEFAULT;
 	int		on_update = XT_KEY_ACTION_DEFAULT;
 	char	name[XT_IDENTIFIER_NAME_SIZE];
+	char	parent_name[XT_IDENTIFIER_NAME_SIZE];
 	u_int	cols = 0;
 
 	// REFERENCES tbl_name
 	pt_current = pt_tokenizer->nextToken(self, "REFERENCES", pt_current);
-	parseQualifiedName(self, name);
-	setReferencedTable(self, name);
+	parseQualifiedName(self, parent_name, name);
+	setReferencedTable(self, parent_name[0] ? parent_name : NULL, name);
 
 	// [ (index_col_name,...) ]
 	if (pt_current->isKeyWord("(")) {
 		pt_current->expectKeyWord(self, "(");
 		do {
 			pt_current = pt_tokenizer->nextToken(self);
-			parseQualifiedName(self, name);
+			parseQualifiedName(self, NULL, name);
 			addReferencedColumn(self, name);
 			cols++;
 			if (cols > req_cols)
@@ -1230,7 +1235,7 @@
 			if (pt_current->isReservedWord(XT_TK_COLUMN))
 				pt_current = pt_tokenizer->nextToken(self);
 
-			parseQualifiedName(self, old_col_name);
+			parseQualifiedName(self, NULL, old_col_name);
 			parseColumnDefinition(self, old_col_name);
 			parseMoveColumn(self);
 		}
@@ -1262,7 +1267,7 @@
 			else {
 				if (pt_current->isReservedWord(XT_TK_COLUMN))
 					pt_current = pt_tokenizer->nextToken(self);
-				parseQualifiedName(self, name);
+				parseQualifiedName(self, NULL, name);
 				dropColumn(self, name);
 			}
 		}
@@ -1270,7 +1275,7 @@
 			pt_current = pt_tokenizer->nextToken(self);
 			if (pt_current->isKeyWord("TO"))
 				pt_current = pt_tokenizer->nextToken(self);
-			parseQualifiedName(self, name);
+			parseQualifiedName(self, NULL, name);
 		}
 		else
 			/* Just ignore the syntax until the next , */
@@ -1295,7 +1300,7 @@
 	else if (pt_current->isKeyWord("SPACIAL"))
 		pt_current = pt_tokenizer->nextToken(self);
 	pt_current = pt_tokenizer->nextToken(self, "INDEX", pt_current);
-	parseQualifiedName(self, name);
+	parseQualifiedName(self, NULL, name);
 	optionalIndexType(self);
 	pt_current = pt_tokenizer->nextToken(self, "ON", pt_current);
 	parseTableName(self, true);
@@ -1310,7 +1315,7 @@
 
 	pt_current = pt_tokenizer->nextToken(self, "DROP", pt_current);
 	pt_current = pt_tokenizer->nextToken(self, "INDEX", pt_current);
-	parseQualifiedName(self, name);
+	parseQualifiedName(self, NULL, name);
 	pt_current = pt_tokenizer->nextToken(self, "ON", pt_current);
 	parseTableName(self, true);
 	dropConstraint(self, name, XT_DD_INDEX);
@@ -1351,7 +1356,7 @@
 	virtual void addConstraint(XTThreadPtr self, char *name, u_int type, bool lastColumn);
 	virtual void dropConstraint(XTThreadPtr self, char *name, u_int type);
 	virtual void addListedColumn(XTThreadPtr self, char *index_col_name);
-	virtual void setReferencedTable(XTThreadPtr self, char *ref_table);
+	virtual void setReferencedTable(XTThreadPtr self, char *ref_schema, char *ref_table);
 	virtual void addReferencedColumn(XTThreadPtr self, char *index_col_name);
 	virtual void setActions(XTThreadPtr self, int on_delete, int on_update);
 
@@ -1546,23 +1551,31 @@
 	}
 }
 
-void XTCreateTable::setReferencedTable(XTThreadPtr self, char *ref_table)
+void XTCreateTable::setReferencedTable(XTThreadPtr self, char *ref_schema, char *ref_table)
 {
 	XTDDForeignKey	*fk = (XTDDForeignKey *) ct_curr_constraint;
 	char			path[PATH_MAX];
 
-	xt_strcpy(PATH_MAX, path, ct_tab_path->ps_path);
-	xt_remove_last_name_of_path(path);
-	if (ct_convert) {
-		char	buffer[XT_IDENTIFIER_NAME_SIZE];
-		size_t	len;
-
-		myxt_static_convert_identifier(self, ct_charset, ref_table, buffer, XT_IDENTIFIER_NAME_SIZE);
-		len = strlen(path);
-		myxt_static_convert_table_name(self, buffer, &path[len], PATH_MAX - len);
-	}
-	else
+	if (ref_schema) {
+		xt_strcpy(PATH_MAX,path, ".");
+		xt_add_dir_char(PATH_MAX, path);
+		xt_strcat(PATH_MAX, path, ref_schema);
+		xt_add_dir_char(PATH_MAX, path);
 		xt_strcat(PATH_MAX, path, ref_table);
+	} else {
+		xt_strcpy(PATH_MAX, path, ct_tab_path->ps_path);
+		xt_remove_last_name_of_path(path);
+		if (ct_convert) {
+			char	buffer[XT_IDENTIFIER_NAME_SIZE];
+			size_t	len;
+
+			myxt_static_convert_identifier(self, ct_charset, ref_table, buffer, XT_IDENTIFIER_NAME_SIZE);
+			len = strlen(path);
+			myxt_static_convert_table_name(self, buffer, &path[len], PATH_MAX - len);
+		}
+		else
+			xt_strcat(PATH_MAX, path, ref_table);
+	}
 
 	fk->fk_ref_tab_name = (XTPathStrPtr) xt_dup_string(self, path);
 }
@@ -2065,8 +2078,13 @@
 
 void XTDDForeignKey::loadString(XTThreadPtr self, XTStringBufferPtr sb)
 {
+	char schema_name[XT_IDENTIFIER_NAME_SIZE];
+	
 	XTDDConstraint::loadString(self, sb);
 	xt_sb_concat(self, sb, " REFERENCES `");
+	xt_2nd_last_name_of_path(XT_IDENTIFIER_NAME_SIZE, schema_name, fk_ref_tab_name->ps_path);
+	xt_sb_concat(self, sb, schema_name);
+	xt_sb_concat(self, sb, "`.`");
 	xt_sb_concat(self, sb, xt_last_name_of_path(fk_ref_tab_name->ps_path));
 	xt_sb_concat(self, sb, "` ");
 
@@ -2877,9 +2895,33 @@
 	return ok;
 }
 
-xtBool XTDDTable::checkCanDrop()
+/*
+ * drop_db parameter is TRUE if we are dropping the schema of this table. In this case
+ * we return TRUE if the table has only refs to the tables from its own schema
+ */
+xtBool XTDDTable::checkCanDrop(xtBool drop_db)
 {
 	/* no refs or references only itself */
-	return (dt_trefs == NULL) || 
-		((dt_trefs->tr_next == NULL) && (dt_trefs->tr_fkey->co_table == this));
+	if ((dt_trefs == NULL) || ((dt_trefs->tr_next == NULL) && (dt_trefs->tr_fkey->co_table == this)))
+		return TRUE;
+
+	if (!drop_db) 
+		return FALSE;
+	
+	const char *this_schema = xt_last_2_names_of_path(dt_table->tab_name->ps_path);
+	size_t this_schema_sz = xt_last_name_of_path(dt_table->tab_name->ps_path) - this_schema;
+	XTDDTableRef *tr = dt_trefs;
+
+	while (tr) {
+		const char *tab_path = tr->tr_fkey->co_table->dt_table->tab_name->ps_path;
+		const char *tab_schema = xt_last_2_names_of_path(tab_path);
+		size_t tab_schema_sz = xt_last_name_of_path(tab_path) - tab_schema;
+
+		if (this_schema_sz != tab_schema_sz || strncmp(this_schema, tab_schema, tab_schema_sz))
+			return FALSE;
+		
+		tr = tr->tr_next;
+	}
+
+	return TRUE;
 }
 
=== modified file 'src/datadic_xt.h'
--- src/datadic_xt.h	2009-05-19 15:22:26 +0000
+++ src/datadic_xt.h	2009-06-12 14:29:30 +0000
@@ -288,7 +288,7 @@
 	XTDDIndex *findReferenceIndex(XTDDForeignKey *fk);
 	bool insertRow(struct XTOpenTable *rec_ot, xtWord1 *buffer);
 	bool checkNoAction(struct XTOpenTable *ot, xtRecordID rec_id);
-	xtBool checkCanDrop();
+	xtBool checkCanDrop(xtBool drop_db);
 	bool deleteRow(struct XTOpenTable *rec_ot, xtWord1 *buffer);
 	void deleteAllRows(XTThreadPtr self);
 	bool updateRow(struct XTOpenTable *rec_ot, xtWord1 *before, xtWord1 *after);
 
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-06-10 16:26:33 +0000
+++ src/ha_pbxt.cc	2009-06-12 14:29:30 +0000
@@ -4682,7 +4682,7 @@
 			pushr_(ha_release_exclusive_use, share);
 			ha_close_open_tables(self, share, NULL);
 
-			xt_drop_table(self, (XTPathStrPtr) table_path);
+			xt_drop_table(self, (XTPathStrPtr) table_path, thd_sql_command(thd) == SQLCOM_DROP_DB);
 
 			freer_(); // ha_release_exclusive_use(share)
 			freer_(); // ha_unget_share(share)
 
=== modified file 'src/table_xt.cc'
--- src/table_xt.cc	2009-05-26 14:01:46 +0000
+++ src/table_xt.cc	2009-06-12 14:29:30 +0000
@@ -1590,7 +1590,7 @@
 	exit_();
 }
 
-xtPublic void xt_drop_table(XTThreadPtr self, XTPathStrPtr tab_name)
+xtPublic void xt_drop_table(XTThreadPtr self, XTPathStrPtr tab_name, xtBool drop_db)
 {
 	XTDatabaseHPtr		db = self->st_database;
 	XTOpenTablePoolPtr	table_pool;
@@ -1614,7 +1614,7 @@
 		tab_id = tab->tab_id;	/* tab is not null if returned table_pool is not null */
 		/* check if other tables refer this */
 		if (!self->st_ignore_fkeys) 
-			can_drop = tab->tab_dic.dic_table->checkCanDrop();
+			can_drop = tab->tab_dic.dic_table->checkCanDrop(drop_db);
 	}
 #ifdef DRIZZLED 
 	/* See the comment in ha_pbxt::delete_table regarding different implmentation of DROP TABLE
 
=== modified file 'src/table_xt.h'
--- src/table_xt.h	2009-05-28 15:17:16 +0000
+++ src/table_xt.h	2009-06-12 14:29:30 +0000
@@ -514,7 +514,7 @@
 int					xt_use_table_by_id(struct XTThread *self, XTTableHPtr *tab, struct XTDatabase *db, xtTableID tab_id);
 XTOpenTablePtr		xt_open_table(XTTableHPtr tab);
 void				xt_close_table(XTOpenTablePtr ot, xtBool flush, xtBool have_table_lock);
-void				xt_drop_table(struct XTThread *self, XTPathStrPtr name);
+void				xt_drop_table(struct XTThread *self, XTPathStrPtr name, xtBool drop_db);
 void				xt_check_table(XTThreadPtr self, XTOpenTablePtr tab);
 void				xt_rename_table(struct XTThread *self, XTPathStrPtr old_name, XTPathStrPtr new_name);
 
 
=== modified file 'test/mysql-test/r/pbxt_bugs.result'
--- test/mysql-test/r/pbxt_bugs.result	2009-06-10 16:26:33 +0000
+++ test/mysql-test/r/pbxt_bugs.result	2009-06-12 14:29:30 +0000
@@ -1230,3 +1230,25 @@
 3
 4
 drop table child, parent;
+create schema test378222;
+use test378222;
+create table t1 (id int primary key);
+create table t2 (id int primary key);
+alter table t1 add constraint foreign key (id) references t2 (id);
+alter table t2 add constraint foreign key (id) references t1 (id);
+drop schema test378222;
+create schema test378222a;
+create schema test378222b;
+create table test378222a.t1 (id int primary key) engine = pbxt;
+create table test378222b.t2 (id int primary key) engine = pbxt;
+alter table test378222a.t1 add constraint foreign key (id) references test378222b.t2 (id);
+alter table test378222b.t2 add constraint foreign key (id) references test378222a.t1 (id);
+set foreign_key_checks = 1;
+drop schema test378222a;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+drop schema test378222b;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+set foreign_key_checks = 0;
+drop schema test378222a;
+drop schema test378222b;
+set foreign_key_checks = 1;
 
=== modified file 'test/mysql-test/t/pbxt_bugs.test'
--- test/mysql-test/t/pbxt_bugs.test	2009-06-10 16:26:33 +0000
+++ test/mysql-test/t/pbxt_bugs.test	2009-06-12 14:29:30 +0000
@@ -938,7 +938,34 @@
 
 drop table child, parent;
 
+# bug 378222: Drop sakila causes error: Cannot delete or update a parent row: a foreign key constraint fails
+
+create schema test378222;
+use test378222;
+create table t1 (id int primary key);
+create table t2 (id int primary key);
+alter table t1 add constraint foreign key (id) references t2 (id);
+alter table t2 add constraint foreign key (id) references t1 (id);
+drop schema test378222;
+
+create schema test378222a;
+create schema test378222b;
+create table test378222a.t1 (id int primary key) engine = pbxt;
+create table test378222b.t2 (id int primary key) engine = pbxt;
+alter table test378222a.t1 add constraint foreign key (id) references test378222b.t2 (id);
+alter table test378222b.t2 add constraint foreign key (id) references test378222a.t1 (id);
+set foreign_key_checks = 1;
+--error 1217
+drop schema test378222a;
+--error 1217
+drop schema test378222b;
+set foreign_key_checks = 0;
+drop schema test378222a;
+drop schema test378222b;
+set foreign_key_checks = 1;
+
 --disable_query_log
+use test;
 DROP TABLE t2, t5;
 drop database pbxt;
 --enable_query_log