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

[Vladimir Kolesnikov]

=== modified file 'ChangeLog'
--- ChangeLog	2010-01-20 15:18:02 +0000
+++ ChangeLog	2010-01-21 11:41:12 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.10e RC4 - Not yet released
 
+RN300: Fixed bug #509968: START TRANSACTION WITH CONSISTENT SNAPSHOT breaks transactional flow.
+
 RN299: Fixed bug #509218: Server asserts with Assertion `mutex->__data.__owner == 0' failed on high concurrency OLTP test.
 
 ------- 1.0.10d RC4 - 2010-01-11

=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2010-01-11 12:55:59 +0000
+++ src/ha_pbxt.cc	2010-01-21 11:41:12 +0000
@@ -477,6 +477,25 @@
 	return removed;
 }
 
+static inline void thd_init_xact(THD *thd, XTThreadPtr self, bool set_table_trans)
+{
+	self->st_xact_mode = thd_tx_isolation(thd) <= ISO_READ_COMMITTED ? XT_XACT_COMMITTED_READ : XT_XACT_REPEATABLE_READ;
+	self->st_ignore_fkeys = (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) != 0;
+	self->st_auto_commit = (thd_test_options(thd,(OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) == 0;
+	if (set_table_trans) {
+#ifdef DRIZZLED
+		self->st_table_trans = FALSE;
+#else
+		self->st_table_trans = thd_sql_command(thd) == SQLCOM_LOCK_TABLES;
+#endif
+	}
+	self->st_abort_trans = FALSE;
+	self->st_stat_ended = FALSE;
+	self->st_stat_trans = FALSE;
+	XT_PRINT0(self, "xt_xn_begin\n");
+	xt_xres_wait_for_recovery(self, XT_RECOVER_SWEPT);
+}
+
 /*
  * -----------------------------------------------------------------------
  * PUBLIC FUNCTIONS
@@ -1424,6 +1443,17 @@
  * 
  * 3. If in BEGIN/END we must call ha_rollback() if we abort the transaction
  *    internally.
+ *
+ * NOTE ON CONSISTENT SNAPSHOTS:
+ * 
+ * PBXT itself doesn't need this functiona as its transaction mechanism provides
+ * consistent snapshots for all transactions by default. This function is needed
+ * only for multi-engine cases like this:
+ *
+ * CREATE TABLE t1 ... ENGINE=INNODB
+ * CREATE TABLE t2 ... ENGINE=PBXT
+ * START TRANSACTION WITH CONSISTENT SNAPSHOT
+ * SELECT * FROM t1 <-- at this point we need to know about the snapshot
  */
 
 static int pbxt_start_consistent_snapshot(handlerton *hton, THD *thd)
@@ -1435,6 +1465,8 @@
 		xt_ha_open_database_of_table(self, (XTPathStrPtr) NULL);
 	}
 
+	thd_init_xact(thd, self, true);
+
 	if (xt_xn_begin(self)) {
 		trans_register_ha(thd, TRUE, hton);	
 	} else {
@@ -4631,19 +4663,8 @@
 			(void) ASSERT_NS(ISO_READ_UNCOMMITTED == XT_XACT_UNCOMMITTED_READ);
 			(void) ASSERT_NS(ISO_SERIALIZABLE == XT_XACT_SERIALIZABLE);
 
-			self->st_xact_mode = thd_tx_isolation(thd) <= ISO_READ_COMMITTED ? XT_XACT_COMMITTED_READ : XT_XACT_REPEATABLE_READ;
-			self->st_ignore_fkeys = (thd_test_options(thd,OPTION_NO_FOREIGN_KEY_CHECKS)) != 0;
-			self->st_auto_commit = (thd_test_options(thd, (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) == 0;
-#ifdef DRIZZLED
-			self->st_table_trans = FALSE;
-#else
-			self->st_table_trans = thd_sql_command(thd) == SQLCOM_LOCK_TABLES;
-#endif
-			self->st_abort_trans = FALSE;
-			self->st_stat_ended = FALSE;
-			self->st_stat_trans = FALSE;
-			XT_PRINT0(self, "xt_xn_begin\n");
-			xt_xres_wait_for_recovery(self, XT_RECOVER_SWEPT);
+			thd_init_xact(thd, self, true);
+
 			if (!xt_xn_begin(self)) {
 				err = xt_ha_pbxt_thread_error_for_mysql(thd, self, pb_ignore_dup_key);
 				pb_ex_in_use = 0;
@@ -4870,15 +4891,9 @@
 
 	/* See comment {START-TRANS} */
 	if (!self->st_xact_data) {
-		self->st_xact_mode = thd_tx_isolation(thd) <= ISO_READ_COMMITTED ? XT_XACT_COMMITTED_READ : XT_XACT_REPEATABLE_READ;
-		self->st_ignore_fkeys = (thd_test_options(thd, OPTION_NO_FOREIGN_KEY_CHECKS)) != 0;
-		self->st_auto_commit = (thd_test_options(thd,(OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) == 0;
-		/* self->st_table_trans = not set here! */
-		self->st_abort_trans = FALSE;
-		self->st_stat_ended = FALSE;
-		self->st_stat_trans = FALSE;
-		XT_PRINT0(self, "xt_xn_begin\n");
-		xt_xres_wait_for_recovery(self, XT_RECOVER_SWEPT);
+
+		thd_init_xact(thd, self, false);
+
 		if (!xt_xn_begin(self)) {
 			err = xt_ha_pbxt_thread_error_for_mysql(thd, self, pb_ignore_dup_key);
 			goto complete;

=== modified file 'test/mysql-test/r/pbxt_snapshot.result'
--- test/mysql-test/r/pbxt_snapshot.result	2009-12-21 19:11:35 +0000
+++ test/mysql-test/r/pbxt_snapshot.result	2010-01-21 11:41:12 +0000
@@ -74,3 +74,12 @@
 COMMIT;
 DROP TABLE t1;
 DROP TABLE t2;
+CREATE TABLE t1 (i INT) ENGINE=PBXT;
+SELECT * FROM t1;
+i
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+INSERT INTO t1 VALUES (1);
+ROLLBACK;
+SELECT * FROM t1;
+i
+DROP TABLE t1;

=== modified file 'test/mysql-test/t/pbxt_snapshot.test'
--- test/mysql-test/t/pbxt_snapshot.test	2009-12-21 19:11:35 +0000
+++ test/mysql-test/t/pbxt_snapshot.test	2010-01-21 11:41:12 +0000
@@ -99,6 +99,18 @@
 DROP TABLE t1;
 DROP TABLE t2;
 
+# bug 509968: START TRANSACTION WITH CONSISTENT SNAPSHOT breaks transactional flow
+# happened because XTThread data was not inited properly and auto-commit flag
+# (raised by the SELECT precedding the transaction) was not reset
+
+CREATE TABLE t1 (i INT) ENGINE=PBXT;
+SELECT * FROM t1;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+INSERT INTO t1 VALUES (1);
+ROLLBACK;
+SELECT * FROM t1;
+DROP TABLE t1;
+
 --disable_query_log
 drop database pbxt;
 --enable_query_log