Merge lp:~vkolesnikov/pbxt/pbxt-maria-windows-app-ver-fixes into lp:pbxt

[Vladimir Kolesnikov]

Hi Paul,

these fixes were done by Vladislav Vaintroub of MariaDB team in the MariaDB branch of PBXT. I merged them back and tested on both Linux and Windows against MariaDB and MySQL 5.1.

Unmerged revisions

868. By vladimir <vladimir@d17> on 2011-06-15

fixes by MariaDB team

=== modified file 'src/cache_xt.cc'
--- src/cache_xt.cc	2010-08-31 10:14:41 +0000
+++ src/cache_xt.cc	2011-06-15 13:25:27 +0000
@@ -717,6 +717,11 @@
 	ind_handle_exit(self);
 
 	if (ind_cac_globals.cg_blocks) {
+		XTIndBlockPtr	block = ind_cac_globals.cg_blocks;
+		for (u_int i=0; i<ind_cac_globals.cg_block_count; i++) {
+			XT_IPAGE_FREE_LOCK(self, &block->cb_lock);
+			block++;
+		}
 		xt_free(self, ind_cac_globals.cg_blocks);
 		ind_cac_globals.cg_blocks = NULL;
 		xt_free_mutex(&ind_cac_globals.cg_lock);
 
=== modified file 'src/discover_xt.cc'
--- src/discover_xt.cc	2010-09-10 14:46:31 +0000
+++ src/discover_xt.cc	2011-06-15 13:25:27 +0000
@@ -1623,7 +1623,7 @@
 #endif
 		       NULL /*default_value*/, NULL /*on_update_value*/, &comment, NULL /*change*/, 
 		       NULL /*interval_list*/, info->field_charset, 0 /*uint_geom_type*/
-#ifdef MARIADB_BASE_VERSION
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 50200
 		       , NULL /*vcol_info*/, NULL /* create options */
 #endif
 		       )) 
 
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2010-12-10 12:45:07 +0000
+++ src/ha_pbxt.cc	2011-06-15 13:25:27 +0000
@@ -1615,7 +1615,7 @@
 static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, const char *thread_name, int *err)
 {
 	THD			*thd;
-	XTThreadPtr	self = NULL;
+	XTThreadPtr	volatile self = NULL;
 
 	*temp_thread = 0;
 	if ((thd = current_thd))
@@ -6159,7 +6159,7 @@
 drizzle_declare_plugin_end;
 #else
 mysql_declare_plugin_end;
-#ifdef MARIADB_BASE_VERSION
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 50200
 maria_declare_plugin(pbxt)
 { /* PBXT */
   MYSQL_STORAGE_ENGINE_PLUGIN,
 
=== modified file 'src/heap_xt.cc'
--- src/heap_xt.cc	2009-11-10 15:17:41 +0000
+++ src/heap_xt.cc	2011-06-15 13:25:27 +0000
@@ -109,6 +109,7 @@
 			if (hp->h_finalize)
 				(*hp->h_finalize)(self, hp);
 			xt_spinlock_unlock(&hp->h_lock);
+			xt_spinlock_free(NULL, &hp->h_lock);
 			xt_free(self, hp);
 			return;
 		}
 
=== modified file 'src/lock_xt.cc'
--- src/lock_xt.cc	2011-04-07 16:12:22 +0000
+++ src/lock_xt.cc	2011-06-15 13:25:27 +0000
@@ -726,11 +726,15 @@
 		rl->rl_groups[i].lg_list_in_use = 0;
 		rl->rl_groups[i].lg_list = NULL;
 	}
+	rl->valid = 1;
 	return OK;
 }
 
 void xt_exit_row_locks(XTRowLocksPtr rl)
 {
+	if (!rl->valid)
+		return;
+
 	for (int i=0; i<XT_ROW_LOCK_GROUP_COUNT; i++) {
 		xt_spinlock_free(NULL, &rl->rl_groups[i].lg_lock);
 		rl->rl_groups[i].lg_wait_queue = NULL;
@@ -741,6 +745,7 @@
 			rl->rl_groups[i].lg_list = NULL;
 		}
 	}
+	rl->valid = 0;
 }
 
 /*
 
=== modified file 'src/lock_xt.h'
--- src/lock_xt.h	2010-05-06 12:18:50 +0000
+++ src/lock_xt.h	2011-06-15 13:25:27 +0000
@@ -658,6 +658,7 @@
 struct XTLockWait;
 
 typedef struct XTRowLocks {
+	int valid;
 	XTLockGroupRec			rl_groups[XT_ROW_LOCK_GROUP_COUNT];
 
 	void	xt_cancel_temp_lock(XTLockWaitPtr lw);
 
=== modified file 'src/table_xt.cc'
--- src/table_xt.cc	2010-11-10 12:03:11 +0000
+++ src/table_xt.cc	2011-06-15 13:25:27 +0000
@@ -728,7 +728,7 @@
 {
 	u_int					edx;
 	XTTableEntryPtr			te_ptr;
-	volatile XTTableHPtr	tab;
+	volatile XTTableHPtr	tab= 0;
 	char					path[PATH_MAX];
 
 	enter_();
@@ -1134,7 +1134,7 @@
 	XTOpenFilePtr	of_rec, of_ind;
 	XTTableEntryPtr	te_ptr;
 	size_t			tab_format_offset;
-	size_t			tab_head_size;
+	size_t			tab_head_size= 0;
 
 	enter_();
 
@@ -1757,6 +1757,8 @@
 			tab_close_mapped_files(self, tab);
 
 			tab_delete_table_files(self, tab_name, tab_id);
+                        /* Remove table from "repair-pending" */
+                        xt_tab_table_repaired(tab);
 
 			ASSERT(xt_get_self() == self);
 			if ((te_ptr = (XTTableEntryPtr) xt_sl_find(self, db->db_table_by_id, &tab_id))) {
@@ -4456,10 +4458,10 @@
 	xtXactID				rec_xn_id = 0;
 	xtBool					wait = FALSE;
 	xtXactID				wait_xn_id = 0;
-	xtRowID					row_id;
+	xtRowID					row_id= 0;
 	xtRecordID				var_rec_id;
 	xtXactID				xn_id;
-	register XTTableHPtr	tab;
+	register XTTableHPtr	tab = 0;
 #ifdef TRACE_VARIATIONS_IN_DUP_CHECK
 	char					t_buf[500];
 	int						len;
 
=== modified file 'src/xaction_xt.cc'
--- src/xaction_xt.cc	2010-08-31 13:58:00 +0000
+++ src/xaction_xt.cc	2011-06-15 13:25:27 +0000
@@ -1123,7 +1123,6 @@
 	 */
 	for (u_int i=0; i<XT_XN_NO_OF_SEGMENTS; i++) {
 		seg = &db->db_xn_idx[i];
-		XT_XACT_INIT_LOCK(self, &seg->xs_tab_lock);
 		seg->xs_last_xn_id = db->db_xn_curr_id;
 	}
 
 
=== modified file 'src/xt_defs.h'
--- src/xt_defs.h	2010-09-10 14:46:31 +0000
+++ src/xt_defs.h	2011-06-15 13:25:27 +0000
@@ -891,7 +891,7 @@
 #define MX_ULONGLONG_T						ulonglong
 #define MX_LONGLONG_T						longlong
 #define MX_CHARSET_INFO						CHARSET_INFO
-#ifdef MARIADB_BASE_VERSION
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 50200
 #define MX_CONST_CHARSET_INFO				const struct charset_info_st
 #else
 #define MX_CONST_CHARSET_INFO				struct charset_info_st