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

[Vladimir Kolesnikov]

[Paul McCullagh (paul-mccullagh)]

Hi Vlad,

We need to log the errors that are being ignored here.

xt_log_and_clear_warning() logs the errors as a warning.

review: Needs Fixing

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

748. By Vladimir Kolesnikov on 2009-12-16

update to the bugfix

[Vladimir Kolesnikov (vkolesnikov)]

> Hi Vlad,
>
> We need to log the errors that are being ignored here.
>
> xt_log_and_clear_warning() logs the errors as a warning.

done

[Vladimir Kolesnikov (vkolesnikov)]

review: Needs Resubmitting

=== modified file 'ChangeLog'
--- ChangeLog	2009-12-10 12:16:56 +0000
+++ ChangeLog	2009-12-16 10:37:11 +0000
@@ -1,6 +1,7 @@
 PBXT Release Notes
 ==================
 
+<<<<<<< TREE
 ------- 1.0.10 RC4 - Not released yet
 
 RN293: Added system variable pbxt_flush_log_at_trx_commit. The value of this variable determines whether the transaction log is written and/or flushed when a transaction is ended. A value of 0 means don't write or flush the transaction log, 1 means write and flush and 2 means write, but do not flush. No matter what the setting is choosen, the transaction log is written and flushed at least once per second.
@@ -12,6 +13,15 @@
 ------- 1.0.09f RC3 - 2009-11-30
 
 RN291: Fixed bug #489088: On shutdown MySQL reports: [Warning] Plugin 'PBXT' will be forced to shutdown.
+=======
+------- 1.0.09g RC3 - not yet released
+
+RN291: Fixed bug #483714: a broken table can prevent other tables from opening
+
+RN290: Fixed bug #489088: On shutdown MySQL reports: [Warning] Plugin 'PBXT' will be forced to shutdown
+
+------- 1.0.09f RC3 - 2009-11-25
+>>>>>>> MERGE-SOURCE
 
 RN290: Fixed bug #345524: pbxt does not compile on 64 bit windows. Currently atomic operations are not supported on this platform.
 
 
=== modified file 'src/discover_xt.cc'
--- src/discover_xt.cc	2009-11-24 08:50:16 +0000
+++ src/discover_xt.cc	2009-12-16 10:37:11 +0000
@@ -355,10 +355,10 @@
   {
     if (!(b_flags & HA_NOSAME))
       return -1;
-    if ((a_flags ^ b_flags) & (HA_NULL_PART_KEY | HA_END_SPACE_KEY))
+    if ((a_flags ^ b_flags) & HA_NULL_PART_KEY)
     {
       /* Sort NOT NULL keys before other keys */
-      return (a_flags & (HA_NULL_PART_KEY | HA_END_SPACE_KEY)) ? 1 : -1;
+      return (a_flags & HA_NULL_PART_KEY) ? 1 : -1;
     }
     if (a->name == primary_key_name)
       return -1;
 
=== modified file 'src/table_xt.cc'
--- src/table_xt.cc	2009-11-25 15:45:25 +0000
+++ src/table_xt.cc	2009-12-16 10:37:11 +0000
@@ -505,7 +505,12 @@
 		xt_strcpy(PATH_MAX, pbuf, te_ptr->te_tab_path->tp_path);
 		xt_add_dir_char(PATH_MAX, pbuf);
 		xt_strcat(PATH_MAX, pbuf, te_ptr->te_tab_name);
-		xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL, NULL));
+		try_(a) {
+			xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL, NULL));
+		} catch_(a) {
+			/* ignore errors */
+			xt_log_and_clear_warning(self);
+		} cont_(a);
 	}
 
 	popr_(); // Discard xt_tab_exit_db(db)
@@ -1148,9 +1153,12 @@
      * will work if we have cyclic foreign key references.
      */ 
 	if (tab->tab_dic.dic_table) {
-		pushr_(xt_del_from_db_tables_ht, tab);
-		tab->tab_dic.dic_table->attachReferences(self, db);
-		popr_();
+		try_(a) {
+			tab->tab_dic.dic_table->attachReferences(self, db);
+		} catch_(a) {
+			/* ignore problems of referenced tables */
+			xt_log_and_clear_warning(self);
+		} cont_(a);
 	}
 
 	*r_tab = tab;
 
=== modified file 'test/mysql-test/r/binlog_stm_ctype_ucs.result'
--- test/mysql-test/r/binlog_stm_ctype_ucs.result	2009-11-10 18:20:34 +0000
+++ test/mysql-test/r/binlog_stm_ctype_ucs.result	2009-12-16 10:37:11 +0000
@@ -5,16 +5,15 @@
 insert into t2 values (@v);
 show binlog events from 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	106	Query	1	174	use `test`; BEGIN
+master-bin.000001	106	Query	1	174	BEGIN
 master-bin.000001	174	Table_map	1	217	table_id: # (test.t2)
 master-bin.000001	217	Write_rows	1	307	table_id: # flags: STMT_END_F
-master-bin.000001	307	Query	1	376	use `test`; COMMIT
+master-bin.000001	307	Query	1	376	COMMIT
 flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
 SET TIMESTAMP=10000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 
=== modified file 'test/mysql-test/r/ctype_cp932_binlog_stm.result'
--- test/mysql-test/r/ctype_cp932_binlog_stm.result	2008-11-05 15:56:49 +0000
+++ test/mysql-test/r/ctype_cp932_binlog_stm.result	2009-12-16 10:37:11 +0000
@@ -9,10 +9,10 @@
 SHOW BINLOG EVENTS FROM 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	use `test`; COMMIT
+master-bin.000001	#	Query	1	#	COMMIT
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300
@@ -35,10 +35,10 @@
 SHOW BINLOG EVENTS FROM 106|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	106	Query	1	196	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	196	Query	1	267	use `test`; BEGIN
+master-bin.000001	196	Query	1	267	BEGIN
 master-bin.000001	267	Table_map	1	309	table_id: 16 (test.t1)
 master-bin.000001	309	Write_rows	1	343	table_id: 16 flags: STMT_END_F
-master-bin.000001	343	Query	1	415	use `test`; COMMIT
+master-bin.000001	343	Query	1	415	COMMIT
 master-bin.000001	415	Query	1	494	use `test`; DROP table t1
 master-bin.000001	494	Query	1	660	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
@@ -49,9 +49,9 @@
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	909	Query	1	977	use `test`; BEGIN
+master-bin.000001	909	Query	1	977	BEGIN
 master-bin.000001	977	Table_map	1	1026	table_id: 18 (test.t4)
 master-bin.000001	1026	Write_rows	1	1080	table_id: 18 flags: STMT_END_F
-master-bin.000001	1080	Query	1	1149	use `test`; COMMIT
+master-bin.000001	1080	Query	1	1149	COMMIT
 master-bin.000001	1149	Query	1	1238	use `test`; DROP PROCEDURE bug18293
 master-bin.000001	1238	Query	1	1317	use `test`; DROP TABLE t4
 
=== modified file 'test/mysql-test/r/ctype_recoding.result'
--- test/mysql-test/r/ctype_recoding.result	2008-03-11 16:31:13 +0000
+++ test/mysql-test/r/ctype_recoding.result	2009-12-16 10:37:11 +0000
@@ -165,7 +165,7 @@
 ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ'
 SET NAMES utf8;
 CREATE TABLE `goodÐÌÏÈÏ` (a int);
-ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ` (a int)'
+ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ'
 set names latin1;
 create table t1 (a char(10) character set koi8r, b text character set koi8r);
 insert into t1 values ('test','test');
 
=== modified file 'test/mysql-test/r/partition.result'
--- test/mysql-test/r/partition.result	2009-06-02 19:05:33 +0000
+++ test/mysql-test/r/partition.result	2009-12-16 10:37:11 +0000
@@ -751,7 +751,7 @@
 subpartition by hash(a)
 (partition p0 values less than (0),
 partition p1 values less than (1) (subpartition sp0));
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 5
+ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'subpartition sp0))' at line 5
 create table t1 (a int)
 partition by hash (a)
 (partition p0 (subpartition sp0));
 
=== modified file 'test/mysql-test/r/pbxt_bugs.result'
--- test/mysql-test/r/pbxt_bugs.result	2009-07-22 08:31:39 +0000
+++ test/mysql-test/r/pbxt_bugs.result	2009-12-16 10:37:11 +0000
@@ -1316,3 +1316,12 @@
 insert into t2 values (1,3);
 ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (Constraint: `fk1`)
 drop table t2, t1;
+create table t2 (id int primary key, constraint foreign key fk1 (id) references t1(id)) engine=pbxt;
+select * from t2;
+id
+insert into t2 values (1);
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (Referenced table `t1` not found)
+create table t1 (id int primary key) engine=pbxt;
+insert into t1 values (1);
+insert into t2 values (1);
+drop table t2, t1;
 
=== modified file 'test/mysql-test/r/pbxt_ref_int.result'
--- test/mysql-test/r/pbxt_ref_int.result	2009-06-30 11:05:34 +0000
+++ test/mysql-test/r/pbxt_ref_int.result	2009-12-16 10:37:11 +0000
@@ -365,7 +365,7 @@
 drop table if exists t2, t1;
 set foreign_key_checks = 1;
 CREATE TABLE t2 (s1 INT DEFAULT NULL, FOREIGN KEY (s1) REFERENCES t1 (s1));
-ERROR HY000: Can't create table 'test.t2' (errno: 151)
+drop table if exists t2;
 set foreign_key_checks = 0;
 CREATE TABLE t2 (s1 INT DEFAULT NULL, FOREIGN KEY (s1) REFERENCES t1 (s1));
 set foreign_key_checks = 1;
 
=== modified file 'test/mysql-test/t/pbxt_bugs.test'
--- test/mysql-test/t/pbxt_bugs.test	2009-07-22 08:31:39 +0000
+++ test/mysql-test/t/pbxt_bugs.test	2009-12-16 10:37:11 +0000
@@ -1023,6 +1023,18 @@
 
 drop table t2, t1;
 
+# bug 483714: a broken table can prevent other tables from opening
+
+create table t2 (id int primary key, constraint foreign key fk1 (id) references t1(id)) engine=pbxt;
+select * from t2;
+--error 1452
+insert into t2 values (1);
+create table t1 (id int primary key) engine=pbxt;
+insert into t1 values (1);
+insert into t2 values (1);
+
+drop table t2, t1;
+
 --disable_query_log
 
 DROP TABLE t5;
 
=== modified file 'test/mysql-test/t/pbxt_ref_int.test'
--- test/mysql-test/t/pbxt_ref_int.test	2009-04-02 20:28:52 +0000
+++ test/mysql-test/t/pbxt_ref_int.test	2009-12-16 10:37:11 +0000
@@ -325,9 +325,10 @@
 drop table if exists t2, t1;
 --enable_warnings
 
+# PBXT doesn't depend on foreign_key_checks setting
 set foreign_key_checks = 1;
---error 1005
 CREATE TABLE t2 (s1 INT DEFAULT NULL, FOREIGN KEY (s1) REFERENCES t1 (s1));
+drop table if exists t2;
 
 set foreign_key_checks = 0;
 CREATE TABLE t2 (s1 INT DEFAULT NULL, FOREIGN KEY (s1) REFERENCES t1 (s1));