Merge lp:~vkolesnikov/pbxt/pbxt-drizzle-merge into lp:pbxt

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

some comments on changes:

1. I had to extend the scope of _try (b) {} _catch (b) {} section to include the second assignment of "thd" variable as otherwise gcc gives a warning stating that the variable can be clobbered by the longjmp.

2. added check for existence of pbxt.location.[frm|dfe] to xt_create_table_frm()

3. other changes are either Drizzle-specific fixes and don't affect MySQL code or are renames of variables, hiding of unused parameters, etc...

[Paul McCullagh (paul-mccullagh)]

Hi Vlad,

This was moved into the try block.

But you did not remove the copy before the try block. I assume you
just forgot...

Was it moved because of clobber warnings?

On Mar 26, 2009, at 9:55 AM, Vladimir Kolesnikov wrote:

> /* Can't do this here yet, because I need a THD! */
> try_(b) {
> + /* {MYSQL QUIRK}
> + * Sometime we have a THD,
> + * sometimes we don't.
> + * So far, I have noticed that during INSTALL PLUGIN,
> + * we have one, otherwize not.
> + */
> + if (!curr_thd) {
> + if (!(thd = (THD *) myxt_create_thread()))
> + xt_throw(self);
> + }
> +

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

[lp:~vkolesnikov/pbxt/pbxt-drizzle-merge]

599. By Paul McCullagh on 2009-03-26

Merged changes for RN232

=== modified file 'ChangeLog'
--- ChangeLog	2009-03-23 15:30:52 +0000
+++ ChangeLog	2009-03-25 01:43:40 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.08 RC - Not yet released
 
+RN232: Merged Drizzle-specific changes into the main tree
+
 RN231: Fixed a bug that caused bad performance as the number of threads increased. This occurred when the number of open table handles exceeded 'table_open_cache', and MySQL started closing open table handlers. PBXT was flushing a table when all table handlers were closed. PBXT will now only do this when the FLUSH TABLES statement is used.
 
 RN230: Improved efficiency of conflict resolution: Implemented a queue for threads waiting for a lock. Threads no longer poll to take a lock. If a temp lock is granted because of an update, then the thread granted the temp lock will also wait for the transaction that did the update to quit.
 
=== modified file 'src/cache_xt.cc'
--- src/cache_xt.cc	2009-03-05 13:28:59 +0000
+++ src/cache_xt.cc	2009-03-25 01:43:40 +0000
@@ -357,8 +357,8 @@
 {
 	DcHandleSlotPtr	hs;
 	XTIndBlockPtr	block = NULL;
-	u_int			hash_idx;
-	DcSegmentPtr	seg;
+	u_int		hash_idx = NULL;
+	DcSegmentPtr	seg = NULL;
 	XTIndBlockPtr	xblock;
 
 	/* The lock order is:
 
=== modified file 'src/datadic_xt.cc'
--- src/datadic_xt.cc	2009-03-25 09:31:29 +0000
+++ src/datadic_xt.cc	2009-03-25 01:43:40 +0000
@@ -1487,13 +1487,13 @@
 		if (lastColumn && ct_curr_column) {
 			/* This constraint has one column, the current column. */
 			XTDDColumnRef	*cref;
-			char			*name = xt_dup_string(self, ct_curr_column->dc_name);
+			char			*col_name = xt_dup_string(self, ct_curr_column->dc_name);
 
 			if (!(cref = new XTDDColumnRef())) {
-				xt_free(self, name);
+				xt_free(self, col_name);
 				xt_throw_errno(XT_CONTEXT, XT_ENOMEM);
 			}
-			cref->cr_col_name = name;
+			cref->cr_col_name = col_name;
 			ct_curr_constraint->co_cols.append(self, cref);
 		}
 	}
@@ -2645,8 +2645,8 @@
 			/* Check that all the columns can be set to NULL! */
 			XTDDColumn *col;
 
-			for (u_int i=0; i<fk->co_cols.size(); i++) {
-				if ((col = findColumn(fk->co_cols.itemAt(i)->cr_col_name))) {
+			for (u_int j=0; j<fk->co_cols.size(); j++) {
+				if ((col = findColumn(fk->co_cols.itemAt(j)->cr_col_name))) {
 					if (!col->dc_null_ok)
 						xt_throw_tabcolerr(XT_CONTEXT, XT_ERR_COLUMN_IS_NOT_NULL, fk->fk_ref_tab_name, col->dc_name);
 				}
 
=== modified file 'src/discover_xt.cc'
--- src/discover_xt.cc	2008-10-29 10:45:13 +0000
+++ src/discover_xt.cc	2009-03-25 01:43:40 +0000
@@ -28,10 +28,12 @@
 #include "item_create.h"
 #include <m_ctype.h>
 #else
-#define DRIZZLE_SERVER 1
+#include <drizzled/session.h>
 #include <drizzled/server_includes.h>
+#include <drizzled/sql_base.h>
 #endif
 
+#include "strutil_xt.h"
 #include "ha_pbxt.h"
 #include "discover_xt.h"
 #include "ha_xtsys.h"
@@ -1280,8 +1282,15 @@
 #endif // LOCK_OPEN_HACK_REQUIRED
 
 //------------------------------
-int xt_create_table_frm(handlerton *hton, THD* thd, const char *db, const char *name, DT_FIELD_INFO *info, DT_KEY_INFO *keys __attribute__((unused)))
+int xt_create_table_frm(handlerton *hton, THD* thd, const char *db, const char *name, DT_FIELD_INFO *info, DT_KEY_INFO *keys __attribute__((unused)), xtBool skip_existing)
 {
+#ifdef DRIZZLED
+	static const char *ext = ".dfe";
+	static const int ext_len = 4;
+#else
+	static const char *ext = ".frm";
+	static const int ext_len = 4;
+#endif
 	int err = 1;
 	//HA_CREATE_INFO create_info = {0};
 	//Alter_info alter_info;
@@ -1295,7 +1304,9 @@
 	
 	/* setup the create info */
 	mylex.create_info.db_type = hton;
- 	mylex.create_info.frm_only = 1;
+#ifndef DRIZZLED 
+	mylex.create_info.frm_only = 1;
+#endif
  	mylex.create_info.default_table_charset = system_charset_info;
 	
 	/* setup the column info. */
@@ -1335,6 +1346,22 @@
 
 		info++;
 	}
+
+	if (skip_existing) {
+		size_t db_len = strlen(db);
+		size_t name_len = strlen(name);
+		size_t len = db_len + 1 + name_len + ext_len + 1;
+		char *path = (char *)xt_malloc_ns(len);
+		memcpy(path, db, db_len);
+		memcpy(path + db_len + 1, name, name_len);
+		memcpy(path + db_len + 1 + name_len, ext, ext_len);
+		path[db_len] = XT_DIR_CHAR;
+		path[len - 1] = '\0';
+		xtBool exists = xt_fs_exists(path);
+		xt_free_ns(path);
+		if (exists)
+			goto noerror;
+	}
 	
 	/* Create an internal temp table */
 #ifdef DRIZZLED
@@ -1345,6 +1372,7 @@
 		goto error;
 #endif
 
+	noerror:
 	err = 0;
 
 	error:
 
=== modified file 'src/discover_xt.h'
--- src/discover_xt.h	2008-10-02 14:24:10 +0000
+++ src/discover_xt.h	2009-03-25 01:43:40 +0000
@@ -24,7 +24,7 @@
 #define __DISCOVER_XT_H__
 
 #ifdef DRIZZLED
-#include <drizzled/common_includes.h>
+#include <drizzled/common.h>
 #else
 #include "mysql_priv.h"
 #endif
@@ -73,7 +73,7 @@
 	const char*	key_columns[8]; // The size of this can be set to what ever you need.
 } DT_KEY_INFO;
 
-int xt_create_table_frm(handlerton *hton, THD* thd, const char *db, const char *name, DT_FIELD_INFO *info, DT_KEY_INFO *keys);
+int xt_create_table_frm(handlerton *hton, THD* thd, const char *db, const char *name, DT_FIELD_INFO *info, DT_KEY_INFO *keys, xtBool skip_existing);
 
 #endif
 
 
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-03-25 09:31:29 +0000
+++ src/ha_pbxt.cc	2009-03-25 01:43:40 +0000
@@ -37,11 +37,19 @@
 #include <time.h>
 
 #ifdef DRIZZLED
-#include <drizzled/common_includes.h>
+#include <drizzled/common.h>
 #include <drizzled/plugin.h>
+#include <mysys/my_alloc.h>
+#include <mysys/hash.h>
+#include <drizzled/field.h>
+#include <drizzled/current_session.h>
 #include <drizzled/data_home.h>
 #include <drizzled/error.h>
-extern ulong max_connections;
+#include <drizzled/table.h>
+#include <drizzled/field/timestamp.h>
+#include <drizzled/server_includes.h>
+extern "C" char **session_query(Session *session);
+#define my_strdup(a,b) strdup(a)
 #else
 #include "mysql_priv.h"
 #include <mysql/plugin.h>
@@ -1140,12 +1148,23 @@
 
 				/* Can't do this here yet, because I need a THD! */
 				try_(b) {
+					/* {MYSQL QUIRK}
+					 * Sometime we have a THD,
+					 * sometimes we don't.
+					 * So far, I have noticed that during INSTALL PLUGIN,
+					 * we have one, otherwize not.
+					 */
+					if (!curr_thd) {
+						if (!(thd = (THD *) myxt_create_thread()))
+							xt_throw(self);
+					}
+
 					xt_open_database(self, mysql_real_data_home, TRUE);
 					pbxt_database = self->st_database;
 					xt_heap_reference(self, pbxt_database);
 				}
 				catch_(b) {
-					if (!curr_thd)
+					if (!curr_thd && thd)
 						myxt_destroy_thread(thd, FALSE);
 #ifndef DRIZZLED
 					myxt_mutex_lock(&LOCK_plugin);
@@ -2213,10 +2232,10 @@
 		table->timestamp_field->set_time();
 
 	if (table->next_number_field && buf == table->record[0]) {
-		int err = update_auto_increment();
-		if (err) {
+		int update_err = update_auto_increment();
+		if (update_err) {
 			ha_log_pbxt_thread_error_for_mysql(pb_ignore_dup_key);
-			return err;
+			return update_err;
 		}
 		set_auto_increment(table->next_number_field);
 	}
@@ -4931,10 +4950,10 @@
 			xt_throw_errno(XT_CONTEXT, XT_ERR_NO_DICTIONARY);
 
 		for (int i = 0, sz = table_dic->dt_fkeys.size(); i < sz; i++) {
-			FOREIGN_KEY_INFO *info= new	// assumed that C++ exceptions are disabled
+			FOREIGN_KEY_INFO *fk_info= new	// assumed that C++ exceptions are disabled
 				(thd_alloc(thd, sizeof(FOREIGN_KEY_INFO))) FOREIGN_KEY_INFO;
 
-			if (info == NULL)
+			if (fk_info == NULL)
 				xt_throw_errno(XT_CONTEXT, XT_ENOMEM);
 
 			XTDDForeignKey *fk = table_dic->dt_fkeys.itemAt(i);
@@ -4953,16 +4972,16 @@
 			ref_tbl_name++;
 			ref_db_name++;
 
-			info->forein_id = thd_make_lex_string(thd, 0,
+			fk_info->forein_id = thd_make_lex_string(thd, 0,
 				fk->co_name, (uint) strlen(fk->co_name), 1);
 
-			info->referenced_db = thd_make_lex_string(thd, 0,
+			fk_info->referenced_db = thd_make_lex_string(thd, 0,
 				ref_db_name, (uint) (ref_tbl_name - ref_db_name - 1), 1);
 
-			info->referenced_table = thd_make_lex_string(thd, 0,
+			fk_info->referenced_table = thd_make_lex_string(thd, 0,
 				ref_tbl_name, (uint) strlen(ref_tbl_name), 1);
 
-			info->referenced_key_name = NULL;			
+			fk_info->referenced_key_name = NULL;			
 
 			XTIndex *ix = fk->getReferenceIndexPtr();
 			if (ix == NULL) /* can be NULL if another thread changes referenced table at the moment */
@@ -4983,7 +5002,7 @@
 					if (ddix->in_index ==  ix->mi_index_no) {
 						const char *ix_name = 
 							ddix->co_name ? ddix->co_name : ddix->co_ind_name;
-						info->referenced_key_name = thd_make_lex_string(thd, 0,
+						fk_info->referenced_key_name = thd_make_lex_string(thd, 0,
 							ix_name, (uint) strlen(ix_name), 1);
 						break;
 					}
@@ -4991,27 +5010,27 @@
 			}
 
 			action = XTDDForeignKey::actionTypeToString(fk->fk_on_delete);
-			info->delete_method = thd_make_lex_string(thd, 0,
+			fk_info->delete_method = thd_make_lex_string(thd, 0,
 				action, (uint) strlen(action), 1);
 			action = XTDDForeignKey::actionTypeToString(fk->fk_on_update);
-			info->update_method = thd_make_lex_string(thd, 0,
+			fk_info->update_method = thd_make_lex_string(thd, 0,
 				action, (uint) strlen(action), 1);
 
 			const XTList<XTDDColumnRef>& cols = fk->co_cols;
 			for (int j = 0, sz2 = cols.size(); j < sz2; j++) {
 				XTDDColumnRef *col_ref= cols.itemAt(j);
-				info->foreign_fields.push_back(thd_make_lex_string(thd, 0,
+				fk_info->foreign_fields.push_back(thd_make_lex_string(thd, 0,
 					col_ref->cr_col_name, (uint) strlen(col_ref->cr_col_name), 1));
 			}
 
 			const XTList<XTDDColumnRef>& ref_cols = fk->fk_ref_cols;
 			for (int j = 0, sz2 = ref_cols.size(); j < sz2; j++) {
 				XTDDColumnRef *col_ref= ref_cols.itemAt(j);
-				info->referenced_fields.push_back(thd_make_lex_string(thd, 0,
+				fk_info->referenced_fields.push_back(thd_make_lex_string(thd, 0,
 					col_ref->cr_col_name, (uint) strlen(col_ref->cr_col_name), 1));
 			}
 
-			f_key_list->push_back(info);
+			f_key_list->push_back(fk_info);
 		}
 	}
 	catch_(a) {
@@ -5180,7 +5199,11 @@
 };
 #endif
 
+#ifdef DRIZZLED
+drizzle_declare_plugin(pbxt)
+#else
 mysql_declare_plugin(pbxt)
+#endif
 {
 	MYSQL_STORAGE_ENGINE_PLUGIN,
 #ifndef DRIZZLED
@@ -5227,7 +5250,11 @@
 	NULL,										/* system variables */
 	NULL										/* config options */
 }
+#ifdef DRIZZLED
+drizzle_declare_plugin_end;
+#else
 mysql_declare_plugin_end;
+#endif
 
 #if defined(XT_WIN) && defined(XT_COREDUMP)
 
 
=== modified file 'src/ha_pbxt.h'
--- src/ha_pbxt.h	2009-03-23 15:30:52 +0000
+++ src/ha_pbxt.h	2009-03-25 01:43:40 +0000
@@ -26,7 +26,10 @@
 #define __ha_pbxt_h__
 
 #ifdef DRIZZLED
-#include <drizzled/common_includes.h>
+#include <drizzled/common.h>
+#include <drizzled/handler.h>
+#include <drizzled/handlerton.h>
+#include <mysys/thr_lock.h>
 #else
 #include "mysql_priv.h"
 #endif
@@ -259,6 +262,7 @@
 /*
  * These hooks are suppossed to only be used by InnoDB:
  */
+#ifndef DRIZZLED
 #ifdef INNODB_COMPATIBILITY_HOOKS
 extern "C" struct charset_info_st *thd_charset(MYSQL_THD thd);
 extern "C" char **thd_query(MYSQL_THD thd);
@@ -274,6 +278,7 @@
 #define thd_binlog_format(t)				(t)->variables.binlog_format
 #define thd_mark_transaction_to_rollback(t)	mark_transaction_to_rollback(t, all)
 #endif // INNODB_COMPATIBILITY_HOOKS */
+#endif /* !DRIZZLED */
 
 /* How to lock MySQL mutexes! */
 #ifdef SAFE_MUTEX
 
=== modified file 'src/ha_xtsys.cc'
--- src/ha_xtsys.cc	2008-11-21 11:38:54 +0000
+++ src/ha_xtsys.cc	2009-03-25 01:43:40 +0000
@@ -35,6 +35,10 @@
 #include <stdlib.h>
 #include <time.h>
 
+#ifdef DRIZZLED
+#include <drizzled/server_includes.h>
+#endif
+
 #include "ha_xtsys.h"
 #include "ha_pbxt.h"
 
@@ -42,6 +46,7 @@
 #include "database_xt.h"
 #include "discover_xt.h"
 #include "systab_xt.h"
+#include "xt_defs.h"
 
 /* Note: mysql_priv.h messes with new, which caused a crash. */
 #ifdef new
 
=== modified file 'src/ha_xtsys.h'
--- src/ha_xtsys.h	2008-10-02 17:11:30 +0000
+++ src/ha_xtsys.h	2009-03-25 01:43:40 +0000
@@ -29,7 +29,9 @@
 #define __HA_XTSYS_H__
 
 #ifdef DRIZZLED
-#include <drizzled/common_includes.h>
+#include <drizzled/common.h>
+#include <drizzled/handler.h>
+#include <drizzled/current_session.h>
 #else
 #include "mysql_priv.h"
 #endif
 
=== modified file 'src/heap_xt.cc'
--- src/heap_xt.cc	2009-03-24 16:24:48 +0000
+++ src/heap_xt.cc	2009-03-25 01:43:40 +0000
@@ -75,7 +75,7 @@
 #ifdef DEBUG
 xtPublic void xt_mm_heap_reference(XTThreadPtr self, XTHeapPtr hp, u_int line, c_char *file)
 #else
-xtPublic void xt_heap_reference(XTThreadPtr self, XTHeapPtr hp)
+xtPublic void xt_heap_reference(XTThreadPtr, XTHeapPtr hp)
 #endif
 {
 	xt_spinlock_lock(&hp->h_lock);
 
=== modified file 'src/index_xt.cc'
--- src/index_xt.cc	2009-03-25 09:31:29 +0000
+++ src/index_xt.cc	2009-03-25 01:43:40 +0000
@@ -427,13 +427,14 @@
 			bitem = base + guess * full_item_size;
 
 			switch (ind->mi_single_type) {
-				case HA_KEYTYPE_LONG_INT:
+				case HA_KEYTYPE_LONG_INT: {
 					register xtInt4 a, b;
 					
 					a = XT_GET_DISK_4(value->sv_key);
 					b = XT_GET_DISK_4(bitem);
 					r = (a < b) ? -1 : (a == b ? 0 : 1);
 					break;
+				}
 				case HA_KEYTYPE_ULONG_INT: {
 					register xtWord4 a, b;
 					
@@ -988,7 +989,7 @@
 /*
  * Remove an item and save to disk.
  */
-static xtBool idx_remove_branch_item_right(XTOpenTablePtr ot, XTIndexPtr ind, xtIndexNodeID address, XTIndReferencePtr iref, register XTIdxItemPtr item)
+static xtBool idx_remove_branch_item_right(XTOpenTablePtr ot, XTIndexPtr ind, xtIndexNodeID, XTIndReferencePtr iref, register XTIdxItemPtr item)
 {
 	register XTIdxBranchDPtr branch = iref->ir_branch;
 	u_int size = item->i_item_size + item->i_node_ref_size;
@@ -1016,7 +1017,7 @@
 	return OK;
 }
 
-static xtBool idx_remove_branch_item_left(XTOpenTablePtr ot, XTIndexPtr ind, xtIndexNodeID address, XTIndReferencePtr iref, register XTIdxItemPtr item)
+static xtBool idx_remove_branch_item_left(XTOpenTablePtr ot, XTIndexPtr ind, xtIndexNodeID, XTIndReferencePtr iref, register XTIdxItemPtr item)
 {
 	register XTIdxBranchDPtr branch = iref->ir_branch;
 	u_int size = item->i_item_size + item->i_node_ref_size;
@@ -2667,7 +2668,7 @@
 
 static void idx_set_index_selectivity(XTThreadPtr self __attribute__((unused)), XTOpenTablePtr ot, XTIndexPtr ind)
 {
-	static const int MAX_RECORDS = 100;
+	static const xtRecordID MAX_RECORDS = 100;
 
 	XTIdxSearchKeyRec	search_key;
 	XTIndexSegPtr		key_seg;
@@ -2680,8 +2681,8 @@
 	u_int				diff;
 	u_int				j, i;
 	/* these 2 vars are used to check the overlapping if we have < 200 records */
-	int					last_rec = 0;		/* last record accounted in this iteration */
-	int					last_iter_rec = 0;	/* last record accounted in the previous iteration */
+	xtRecordID			last_rec = 0;		/* last record accounted in this iteration */
+	xtRecordID			last_iter_rec = 0;	/* last record accounted in the previous iteration */
 
 	xtBool	(* xt_idx_iterator[2])(
 		register struct XTOpenTable *ot, register struct XTIndex *ind, register XTIdxSearchKeyPtr search_key) = {
@@ -2932,7 +2933,7 @@
 #endif
 
 	ind = tab->tab_dic.dic_keys;
-	for (u_int i=0; i<tab->tab_dic.dic_key_count; i++, ind++) {
+	for (u_int k=0; k<tab->tab_dic.dic_key_count; k++, ind++) {
 		ind_count = idx_check_index(ot, *ind, TRUE);
 		block_count += ind_count;
 	}
@@ -2963,10 +2964,10 @@
 
 	current = tab->tab_ind_free;
 	if (XT_NODE_ID(current)) {
-		u_int i = 0;
+		u_int k = 0;
 		printf("Disk List:");
 		while (XT_NODE_ID(current)) {
-			if ((i % 40) == 0)
+			if ((k % 40) == 0)
 				printf("\n");
 			free_count++;
 #ifdef TRACK_ACTIVITY
@@ -2978,9 +2979,9 @@
 				break;
 			}
 			XT_NODE_ID(current) = (xtIndexNodeID) XT_GET_DISK_8(free_block.if_next_block_8);
-			i++;
+			k++;
 		}
-		if ((i % 40) != 0)
+		if ((k % 40) != 0)
 			printf("\n");
 	}
 	printf("\n-----------------------------\n");
 
=== modified file 'src/lock_xt.cc'
--- src/lock_xt.cc	2009-03-25 09:31:29 +0000
+++ src/lock_xt.cc	2009-03-25 01:43:40 +0000
@@ -100,7 +100,7 @@
 	return 0;
 }
 
-void XTRowLockList::xt_remove_all_locks(struct XTDatabase *db, XTThreadPtr thread)
+void XTRowLockList::xt_remove_all_locks(struct XTDatabase *, XTThreadPtr thread)
 {
 #ifdef XT_TRACE_LOCKS
 	xt_ttracef(xt_get_self(), "remove all locks\n");
@@ -145,7 +145,7 @@
 					copy = group->lg_list;
 					item = group->lg_list;
 					new_count = 0;
-					for (int k=0; k<group->lg_list_in_use; k++) {
+					for (size_t k=0; k<group->lg_list_in_use; k++) {
 						if (item->li_thread_id != thd_id) {
 							if (copy != item) {
 								copy->li_row_id = item->li_row_id;
@@ -215,7 +215,7 @@
 }
 #endif
 
-xtBool XTRowLocks::rl_lock_row(XTLockGroupPtr group, XTLockWaitPtr lw, XTRowLockListPtr lock_list, int *result)
+xtBool XTRowLocks::rl_lock_row(XTLockGroupPtr group, XTLockWaitPtr lw, XTRowLockListPtr, int *result)
 {
 	XTLockItemPtr	item;
 	size_t			index;
@@ -450,7 +450,7 @@
 	XTLockItemPtr	item;
 	size_t			index;
 	xtBool			lock_granted = FALSE;
-	xtThreadID		locking_thread_id;
+	xtThreadID		locking_thread_id = 0;
 
 	if (!(row_id = ot->ot_temp_row_lock))
 		return;
@@ -566,7 +566,7 @@
 
 	/* Add to the lock list: */
 	XTPermRowLockPtr locks = (XTPermRowLockPtr) lock_list->bl_data;
-	for (int i=0; i<lock_list->bl_count; i++) {
+	for (unsigned i=0; i<lock_list->bl_count; i++) {
 #ifdef XT_USE_TABLE_REF
 		if (locks->pr_table == ot->ot_table) {
 #else
@@ -1732,7 +1732,7 @@
 #endif
 }
 
-xtPublic void xt_atomicrwlock_free(struct XTThread *self, XTAtomicRWLockPtr arw)
+xtPublic void xt_atomicrwlock_free(struct XTThread *, XTAtomicRWLockPtr XT_UNUSED(arw))
 {
 #ifdef XT_THREAD_LOCK_INFO
 	xt_thread_lock_info_free(&arw->arw_lock_info);
 
=== modified file 'src/lock_xt.h'
--- src/lock_xt.h	2009-03-24 16:26:04 +0000
+++ src/lock_xt.h	2009-03-25 01:43:40 +0000
@@ -630,8 +630,8 @@
 	XTSpinLockRec			lg_lock;				/* A lock for the list. */
 	XTLockWaitPtr			lg_wait_queue;			/* A queue of threads waiting for a lock in this group. */
 	XTLockWaitPtr			lg_wait_queue_end;		/* The end of the thread queue. */
-	int						lg_list_size;			/* The size of the list. */
-	int						lg_list_in_use;			/* Number of slots on the list in use. */
+	size_t						lg_list_size;			/* The size of the list. */
+	size_t						lg_list_in_use;			/* Number of slots on the list in use. */
 	XTLockItemPtr			lg_list;				/* List of locks. */
 } XTLockGroupRec, *XTLockGroupPtr;
 
 
=== modified file 'src/myxt_xt.cc'
--- src/myxt_xt.cc	2009-02-20 14:26:09 +0000
+++ src/myxt_xt.cc	2009-03-25 01:43:40 +0000
@@ -27,10 +27,17 @@
 #include "xt_config.h"
 
 #ifdef DRIZZLED
-#define DRIZZLE_SERVER 1
 #include <drizzled/server_includes.h>
 #include <drizzled/plugin.h>
 #include <drizzled/show.h>
+#include <drizzled/field/blob.h>
+#include <drizzled/field/enum.h>
+#include <drizzled/field/varstring.h>
+#include <drizzled/current_session.h>
+#include <drizzled/sql_lex.h>
+#include <drizzled/session.h>
+extern "C" struct charset_info_st *session_charset(Session *session);
+extern pthread_key_t THR_Session;
 #else
 #include "mysql_priv.h"
 #include <mysql/plugin.h>
@@ -623,7 +630,6 @@
 		case DRIZZLE_TYPE_NULL:
 		case DRIZZLE_TYPE_TIMESTAMP:
 		case DRIZZLE_TYPE_LONGLONG:
-		case DRIZZLE_TYPE_TIME:
 		case DRIZZLE_TYPE_DATETIME:
 		case DRIZZLE_TYPE_DATE:
 		case DRIZZLE_TYPE_NEWDECIMAL:
@@ -743,7 +749,6 @@
 		case DRIZZLE_TYPE_NULL:
 		case DRIZZLE_TYPE_TIMESTAMP:
 		case DRIZZLE_TYPE_LONGLONG:
-		case DRIZZLE_TYPE_TIME:
 		case DRIZZLE_TYPE_DATETIME:
 		case DRIZZLE_TYPE_DATE:
 		case DRIZZLE_TYPE_NEWDECIMAL:
@@ -1872,7 +1877,9 @@
 
 static void my_close_table(TABLE *table)
 {
-    closefrm(table, 1);  // TODO: Q, why did Stewart remove this?
+#ifndef DRIZZLED
+	closefrm(table, 1);  // TODO: Q, why did Stewart remove this?
+#endif
 	xt_free_ns(table);
 }
 
@@ -2168,6 +2175,18 @@
 			seg->bit_start = ((Field_bit *) field)->bit_ofs;
 			seg->bit_pos = (uint) (((Field_bit *) field)->bit_ptr - (uchar*) table_arg->record[0]);
 		}
+#else
+		/* Drizzle uses HA_KEYTYPE_ULONG_INT keys for enums > 1 byte, which is not consistent with MySQL, so we fix it here  */
+		else if (field->type() == MYSQL_TYPE_ENUM) {
+			switch (seg->length) {
+				case 2: 
+					seg->type = HA_KEYTYPE_USHORT_INT;
+					break;
+				case 3:
+					seg->type = HA_KEYTYPE_UINT24;
+					break;
+			}
+		}
 #endif
 
 		switch (seg->type) {
@@ -2524,7 +2543,7 @@
 	if (!dic_rec_fixed) {
 		xtWord8 max_rec_size = offsetof(XTTabRecExt, re_data);
 
-		for (Field **field=my_tab->field; (curr_field = *field); field++) {
+		for (Field **f=my_tab->field; (curr_field = *f); f++) {
 			max_data_size = curr_field->key_length();
 			enum_field_types tno = curr_field->type();
 			if (tno == MYSQL_TYPE_BLOB)
@@ -3036,7 +3055,7 @@
 	table->field[column]->store(string, strlen(string), charset);
 }
 
-xtPublic int myxt_statistics_fill_table(XTThreadPtr self, void *th, void *ta, void *co, MX_CONST void *ch)
+xtPublic int myxt_statistics_fill_table(XTThreadPtr self, void *th, void *ta, void *, MX_CONST void *ch)
 {
 	THD				*thd = (THD *) th;
 	TABLE_LIST		*tables = (TABLE_LIST *) ta;
 
=== modified file 'src/restart_xt.cc'
--- src/restart_xt.cc	2009-03-25 09:31:29 +0000
+++ src/restart_xt.cc	2009-03-25 01:43:40 +0000
@@ -1772,15 +1772,15 @@
 		/* Read the checkpoint data: */
 		if (use_buffer) {
 			u_int		no_of_logs;
-			xtLogID		log_id;
-			xtTableID	tab_id;
+			xtLogID		xt_log_id;
+			xtTableID	xt_tab_id;
 
 			xres_cp_number = XT_GET_DISK_6(use_buffer->xcp_chkpnt_no_6);
 			xres_cp_log_id = XT_GET_DISK_4(use_buffer->xcp_log_id_4);
 			xres_cp_log_offset = XT_GET_DISK_6(use_buffer->xcp_log_offs_6);
-			tab_id = XT_GET_DISK_4(use_buffer->xcp_tab_id_4);
-			if (tab_id > db->db_curr_tab_id)
-				db->db_curr_tab_id = tab_id;
+			xt_tab_id = XT_GET_DISK_4(use_buffer->xcp_tab_id_4);
+			if (xt_tab_id > db->db_curr_tab_id)
+				db->db_curr_tab_id = xt_tab_id;
 			db->db_xn_curr_id = XT_GET_DISK_4(use_buffer->xcp_xact_id_4);
 			ind_rec_log_id = XT_GET_DISK_4(use_buffer->xcp_ind_rec_log_id_4);
 			ind_rec_log_offset = XT_GET_DISK_6(use_buffer->xcp_ind_rec_log_offs_6);
@@ -1808,16 +1808,16 @@
 			 * will be removed.
 			 */
 			for (u_int i=0; i<no_of_logs; i++) {
-				log_id = (xtLogID) XT_GET_DISK_2(use_buffer->xcp_del_log[i]);
+				xt_log_id = (xtLogID) XT_GET_DISK_2(use_buffer->xcp_del_log[i]);
 #ifdef DEBUG_PRINT
 				if (i != 0)
 					printf(", ");
-				printf("%d", (int) log_id);
+				printf("%d", (int) xt_log_id);
 #endif
 #ifdef DEBUG_KEEP_LOGS
-				xt_dl_set_to_delete(self, db, log_id);
+				xt_dl_set_to_delete(self, db, xt_log_id);
 #else
-				if (!xres_delete_data_log(db, log_id))
+				if (!xres_delete_data_log(db, xt_log_id))
 					xt_throw(self);
 #endif
 			}
 
=== modified file 'src/systab_xt.cc'
--- src/systab_xt.cc	2008-12-22 14:29:21 +0000
+++ src/systab_xt.cc	2009-03-25 01:43:40 +0000
@@ -30,6 +30,10 @@
 
 #include <stdlib.h>
 #include <time.h>
+#ifdef DRIZZLED
+#include <drizzled/server_includes.h>
+#include <drizzled/current_session.h>
+#endif
 
 #include "ha_pbxt.h"
 #include "systab_xt.h"
@@ -593,7 +597,8 @@
 			current_thd, "pbxt",
 			strchr(xt_internal_tables[i].sts_path, '.') + 1,
 			xt_internal_tables[i].sts_info,
-			xt_internal_tables[i].sts_keys))
+			xt_internal_tables[i].sts_keys,
+			TRUE /*do not recreate*/))
 			xt_internal_tables[i].sts_exists = TRUE;
 		i++;
 	}
 
=== modified file 'src/table_xt.cc'
--- src/table_xt.cc	2009-03-25 09:31:29 +0000
+++ src/table_xt.cc	2009-03-25 01:43:40 +0000
@@ -32,7 +32,10 @@
 #include <time.h>
 
 #ifdef DRIZZLED
-#include <drizzled/common_includes.h>
+#include <drizzled/common.h>
+#include <mysys/thr_lock.h>
+#include <drizzled/dtcollation.h>
+#include <drizzled/handlerton.h>
 #else
 #include "mysql_priv.h"
 #endif
 
=== modified file 'src/xaction_xt.cc'
--- src/xaction_xt.cc	2009-03-25 09:31:29 +0000
+++ src/xaction_xt.cc	2009-03-25 01:43:40 +0000
@@ -462,6 +462,7 @@
 			tn_thd_id = wait_xact_ptr->xd_thread_id;
 		}
 		else {
+			tn_thd_id = 0;
 			if (!xn_get_xact_details(db, xw->xw_xn_id, thread, &flags, &start, NULL, &tn_thd_id))
 				flags = XT_XN_XAC_ENDED | XT_XN_XAC_SWEEP;
 		}
 
=== modified file 'src/xt_config.h'
--- src/xt_config.h	2009-02-05 11:30:34 +0000
+++ src/xt_config.h	2009-03-25 01:43:40 +0000
@@ -33,6 +33,7 @@
 
 #ifdef DRIZZLED
 #include "drizzled/global.h"
+const int max_connections = 500;
 #else
 #include <mysql_version.h>
 #include "my_global.h"
 
=== modified file 'src/xt_defs.h'
--- src/xt_defs.h	2009-03-25 09:31:29 +0000
+++ src/xt_defs.h	2009-03-25 01:43:40 +0000
@@ -739,6 +739,17 @@
 
 #define mysql_real_data_home				drizzle_real_data_home
 
+#define mi_int4store(T,A)   { uint32_t def_temp= (uint32_t) (A);\
+                              ((unsigned char*) (T))[3]= (unsigned char) (def_temp);\
+                              ((unsigned char*) (T))[2]= (unsigned char) (def_temp >> 8);\
+                              ((unsigned char*) (T))[1]= (unsigned char) (def_temp >> 16);\
+                              ((unsigned char*) (T))[0]= (unsigned char) (def_temp >> 24); }
+
+#define mi_uint4korr(A) ((uint32_t) (((uint32_t) (((const unsigned char*) (A))[3])) +\
+                                   (((uint32_t) (((const unsigned char*) (A))[2])) << 8) +\
+                                   (((uint32_t) (((const unsigned char*) (A))[1])) << 16) +\
+                                   (((uint32_t) (((const unsigned char*) (A))[0])) << 24)))
+
 #else // DRIZZLED
 /* The MySQL case: */
 #if MYSQL_VERSION_ID >= 60008