bk commit into 6.0 tree (klewis:1.2808)

[klewis]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  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, 2008-02-06 11:38:48-06:00, klewis@klewis-mysql. +2 -0
  Compiler warning about unused variables.
  34241 - Deleate the extra state field and use the 
  existing stateNames array for displayed text.
  34331 - Convert -1 to 1 for boolean values sent by the
  server for a setting, specifically falcon_consistent_read.

  storage/falcon/Transaction.cpp@stripped, 2008-02-06 11:38:20-06:00, klewis@klewis-mysql. +3 -17
    Compiler warning about unused variables.
    34241 - Deleate the extra state field and use the 
    existing stateNames array for displayed text.

  storage/falcon/ha_falcon.cpp@stripped, 2008-02-06 11:38:23-06:00, klewis@klewis-mysql. +1 -2
    34331 - Convert -1 to 1 for boolean values sent by the
    server for a setting, specifically falcon_consistent_read.
    34241 - Delete the extra state field and use the 
    existing stateNames array for displayed text.

diff -Nrup a/storage/falcon/Transaction.cpp b/storage/falcon/Transaction.cpp
--- a/storage/falcon/Transaction.cpp	2008-02-05 15:50:30 -06:00
+++ b/storage/falcon/Transaction.cpp	2008-02-06 11:38:20 -06:00
@@ -464,8 +464,8 @@ void Transaction::rollback()
 
 void Transaction::expungeTransaction(Transaction * transaction)
 {
-	TransId oldId = transactionId;
-	int orgState = state;
+	//TransId oldId = transactionId;
+	//int orgState = state;
 	ASSERT(states != NULL || numberStates == 0);
 	int n = 0;
 	
@@ -1213,24 +1213,10 @@ void Transaction::getInfo(InfoTable* inf
 {
 	if (!(state == Available && dependencies == 0))
 		{
-		const char * ptr;
-		switch (state)
-			{
-			case Active:				ptr = "Active"; break;
-			case Limbo:					ptr = "Limbo"; break;
-			case Committed:				ptr = "Committed"; break;
-			case RolledBack:			ptr = "RolledBack"; break;
-			case Available:				ptr = "Available"; break;
-			case Initializing:			ptr = "Initializing"; break;
-			case CommittingReadOnly:	ptr = "CommittingReadOnly"; break;
-			default:					ptr = "Unknown"; break;
-			}
-
 		int n = 0;
-		infoTable->putString(n++, ptr);
+		infoTable->putString(n++, stateNames[state]);
 		infoTable->putInt(n++, mySqlThreadId);
 		infoTable->putInt(n++, transactionId);
-		infoTable->putString(n++, stateNames[state]);
 		infoTable->putInt(n++, hasUpdates);
 		infoTable->putInt(n++, writePending);
 		infoTable->putInt(n++, dependencies);
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-02-03 15:42:21 -06:00
+++ b/storage/falcon/ha_falcon.cpp	2008-02-06 11:38:23 -06:00
@@ -2851,7 +2851,6 @@ ST_FIELD_INFO transactionInfoFieldInfo[]
 	{"STATE",			120, MYSQL_TYPE_STRING,		0, 0, "State", SKIP_OPEN_TABLE},
 	{"THREAD_ID",		4, MYSQL_TYPE_LONG,			0, 0, "Thread Id", SKIP_OPEN_TABLE},
 	{"ID",				4, MYSQL_TYPE_LONG,			0, 0, "Id", SKIP_OPEN_TABLE},
-	{"STATE",			10, MYSQL_TYPE_STRING,		0, 0, "State", SKIP_OPEN_TABLE},
 	{"UPDATES",			4, MYSQL_TYPE_LONG,			0, 0, "Has Updates", SKIP_OPEN_TABLE},
 	{"PENDING",			4, MYSQL_TYPE_LONG,			0, 0, "Write Pending", SKIP_OPEN_TABLE},
 	{"DEP",				4, MYSQL_TYPE_LONG,			0, 0, "Dependencies", SKIP_OPEN_TABLE},
@@ -3064,7 +3063,7 @@ static void updateRecordChillThreshold(M
 
 void StorageInterface::updateConsistentRead(MYSQL_THD thd, struct st_mysql_sys_var* variable, void *var_ptr, void *save)
 {
-	falcon_consistent_read = *(my_bool*) save;
+	falcon_consistent_read = (my_bool) (*(int *) save ? 1 : 0);
 
 	int newRepeatableRead = (falcon_consistent_read ? 
 		TRANSACTION_CONSISTENT_READ : TRANSACTION_WRITE_COMMITTED);