bk commit into 6.0 tree (serg:1.2689)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
6.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-22 19:43:31+01:00, serg@stripped +1 -0
  after merge fix

  storage/falcon/ha_falcon.cpp@stripped, 2007-11-22 19:43:28+01:00, serg@stripped +1 -1
    after merge fix

diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2007-11-16 11:19:44 +01:00
+++ b/storage/falcon/ha_falcon.cpp	2007-11-22 19:43:28 +01:00
@@ -1007,7 +1007,7 @@ int StorageInterface::prepare(handlerton
 	DBUG_ENTER("StorageInterface::prepare");
 
 	if (all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
-		storageHandler->prepare(thd, sizeof(thd->transaction.xid), (const unsigned char*) &thd->transaction.xid);
+		storageHandler->prepare(thd, sizeof(thd->transaction.xid_state.xid), (const unsigned char*) &thd->transaction.xid_state.xid);
 	else
 		{
 		StorageConnection *storageConnection = getStorageConnection(thd);