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

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

Fixed a problem in the myxt_create_foreign_key_from_row function. It incorrectly calculated resulting key length which could lead to incorrect inter-table key comparison and false key change detections within a single table. Also perfromaed refactoring: removed XT_KEY_ACTION_DEFAULT that was functionally identical to XT_KEY_ACTION_RESTRICT.

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

787. By Vladimir Kolesnikov on 2010-02-12

updated ChangeLog

=== modified file 'ChangeLog'
--- ChangeLog	2010-02-11 10:11:06 +0000
+++ ChangeLog	2010-02-12 17:39:16 +0000
@@ -3,7 +3,8 @@
 
 ------- 1.0.10g RC4 - 2010-02-11
 
-RN306:  All tests now run with MySQL 5.1.42.
+RN307: Fixed bug #509803: can't run tpcc (cannot compare FKs that rely on indexes of different length)
+RN306: All tests now run with MySQL 5.1.42.
 
 RN305: Fixed a bug that could cause a crash in filesort. The problem was that the return row estimate was incorrect, which caused the result of estimate_rows_upper_bound() to overflow to zero. Row estimate has been changed, and no longer takes into account deleted rows (so the row estimate is now a maximum).
 
 
=== modified file 'src/datadic_xt.cc'
--- src/datadic_xt.cc	2010-02-05 08:17:33 +0000
+++ src/datadic_xt.cc	2010-02-12 17:39:16 +0000
@@ -1142,8 +1142,8 @@
 
 void XTParseTable::parseReferenceDefinition(XTThreadPtr self, u_int req_cols)
 {
-	int		on_delete = XT_KEY_ACTION_DEFAULT;
-	int		on_update = XT_KEY_ACTION_DEFAULT;
+	int		on_delete = XT_KEY_ACTION_RESTRICT;
+	int		on_update = XT_KEY_ACTION_RESTRICT;
 	char	name[XT_IDENTIFIER_NAME_SIZE];
 	char	parent_name[XT_IDENTIFIER_NAME_SIZE];
 	u_int	cols = 0;
@@ -2145,7 +2145,7 @@
 	}
 	xt_sb_concat(self, sb, "`)");
 	
-	if (fk_on_delete != XT_KEY_ACTION_DEFAULT && fk_on_delete != XT_KEY_ACTION_RESTRICT) {
+	if (fk_on_delete != XT_KEY_ACTION_RESTRICT) {
 		xt_sb_concat(self, sb, " ON DELETE ");
 		switch (fk_on_delete) {
 			case XT_KEY_ACTION_CASCADE:		xt_sb_concat(self, sb, "CASCADE"); break;
@@ -2154,10 +2154,9 @@
 			case XT_KEY_ACTION_NO_ACTION:	xt_sb_concat(self, sb, "NO ACTION"); break;
 		}
 	}
-	if (fk_on_update != XT_KEY_ACTION_DEFAULT && fk_on_update != XT_KEY_ACTION_RESTRICT) {
+	if (fk_on_update != XT_KEY_ACTION_RESTRICT) {
 		xt_sb_concat(self, sb, " ON UPDATE ");
 		switch (fk_on_update) {
-			case XT_KEY_ACTION_DEFAULT:		xt_sb_concat(self, sb, "RESTRICT"); break;
 			case XT_KEY_ACTION_RESTRICT:	xt_sb_concat(self, sb, "RESTRICT"); break;
 			case XT_KEY_ACTION_CASCADE:		xt_sb_concat(self, sb, "CASCADE"); break;
 			case XT_KEY_ACTION_SET_NULL:	xt_sb_concat(self, sb, "SET NULL"); break;
@@ -2417,7 +2416,6 @@
 {
 	switch (action)
 	{
-	case XT_KEY_ACTION_DEFAULT:
 	case XT_KEY_ACTION_RESTRICT:
 		return "RESTRICT";
 	case XT_KEY_ACTION_CASCADE:
 
=== modified file 'src/datadic_xt.h'
--- src/datadic_xt.h	2009-07-22 08:31:39 +0000
+++ src/datadic_xt.h	2010-02-12 17:39:16 +0000
@@ -45,7 +45,6 @@
 #define XT_DD_KEY_PRIMARY			2
 #define XT_DD_KEY_FOREIGN			3
 
-#define XT_KEY_ACTION_DEFAULT		0
 #define XT_KEY_ACTION_RESTRICT		1
 #define XT_KEY_ACTION_CASCADE		2
 #define XT_KEY_ACTION_SET_NULL		3
 
=== modified file 'src/myxt_xt.cc'
--- src/myxt_xt.cc	2010-01-22 13:24:35 +0000
+++ src/myxt_xt.cc	2010-02-12 17:39:16 +0000
@@ -531,7 +531,7 @@
 		key += length;
 	}
 
-	return fkey_ind->mi_fix_key ? fkey_ind->mi_key_size : (u_int) (key - start);		/* Return keylength */
+	return (u_int) (key - start);
 }
 
 /* I may be overcautious here, but can I assume that
 
=== modified file 'test/mysql-test/r/pbxt_bugs.result'
--- test/mysql-test/r/pbxt_bugs.result	2010-02-02 11:56:39 +0000
+++ test/mysql-test/r/pbxt_bugs.result	2010-02-12 17:39:17 +0000
@@ -1833,3 +1833,23 @@
 498	Update row 3 Update #497 -> Update #498
 497	Update row 3 Update #496 -> Update #497
 496	Update row 3 Update #495 -> Update #496
+create table t1 (c1 int, c2 int, primary key (c1, c2));
+insert into t1 values (1,1), (2,2), (3,3);
+create table t2 (c1 int, c char, primary key(c1));
+alter table t2 add constraint foreign key (c1) references t1 (c1);
+insert into t2 (c1) values (1), (2), (3);
+update t1 set c1 = 4 where c1 = 2;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (Constraint: `FOREIGN_1`)
+drop table t2;
+create table t2 (c1 int, c char, primary key(c1));
+alter table t2 add constraint foreign key (c1) references t1 (c1) on update cascade;
+insert into t2 (c1) values (1), (2), (3);
+update t1 set c1 = 4 where c1 = 2;
+select * from t2;
+c1	c
+1	NULL
+3	NULL
+4	NULL
+update t1 set c1 = 1 where c1 = 4;
+ERROR 23000: Upholding foreign key constraints for table 't1', entry '1-2', key 1 would lead to a duplicate entry
+drop table t2, t1;
 
=== modified file 'test/mysql-test/t/pbxt_bugs.test'
--- test/mysql-test/t/pbxt_bugs.test	2010-02-02 11:56:39 +0000
+++ test/mysql-test/t/pbxt_bugs.test	2010-02-12 17:39:17 +0000
@@ -1084,6 +1084,28 @@
 --enable_result_log
 select * from tb0_logs order by i1 desc limit 5;
 
+#
+# bug 509803: Can't run tpcc (cannot check FKs if they rely on indexes of different length)
+#
+
+create table t1 (c1 int, c2 int, primary key (c1, c2));
+insert into t1 values (1,1), (2,2), (3,3);
+create table t2 (c1 int, c char, primary key(c1));
+alter table t2 add constraint foreign key (c1) references t1 (c1);
+insert into t2 (c1) values (1), (2), (3);
+--error 1451
+update t1 set c1 = 4 where c1 = 2;
+drop table t2;
+create table t2 (c1 int, c char, primary key(c1));
+alter table t2 add constraint foreign key (c1) references t1 (c1) on update cascade;
+insert into t2 (c1) values (1), (2), (3);
+update t1 set c1 = 4 where c1 = 2;
+select * from t2;
+--error 1557
+update t1 set c1 = 1 where c1 = 4;
+drop table t2, t1;
+
+
 --disable_query_log
 drop trigger tb0_eng2_upd;
 drop table tb0_eng2, tb0_logs;