bk commit into 5.1-falcon tree (jas:1.2582)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
5.1-falcon repository of jas. When jas 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-04-11 17:02:28-04:00, jas@stripped +2 -0
  Fix information schema build problems.

  storage/falcon/InfoTable.cpp@stripped, 2007-04-11 17:02:25-04:00, jas@stripped +4 -0
    Define macro MYSQL_SERVER to get mysqld definitions.

  storage/falcon/Transaction.cpp@stripped, 2007-04-11 17:02:25-04:00, jas@stripped +2 -2
    Print a little more transaction state for the Transaction
    print calls.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	fluffy.netfrastructure.com
# Root:	/home/mysql/mysql-5.1-falcon

--- 1.1/storage/falcon/InfoTable.cpp	2007-04-11 17:02:34 -04:00
+++ 1.2/storage/falcon/InfoTable.cpp	2007-04-11 17:02:34 -04:00
@@ -15,6 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#ifndef MYSQL_SERVER
+#define MYSQL_SERVER
+#endif
+
 #include <string.h>
 #include "mysql_priv.h"
 #include "InfoTable.h"

--- 1.70/storage/falcon/Transaction.cpp	2007-04-11 17:02:34 -04:00
+++ 1.71/storage/falcon/Transaction.cpp	2007-04-11 17:02:34 -04:00
@@ -856,7 +856,7 @@
 
 void Transaction::print(void)
 {
-	Log::debug("  %p Transaction %d, state %d, hasUpdates %d, writePending %d, number states %d, dependencies\n",
+	Log::debug("  %p Id %d, state %d, updates %d, wrtPend %d, states %d, dependencies %d, records %d\n",
 			this, transactionId, state, hasUpdates, writePending, 
-			numberStates, dependencies);
+			numberStates, dependencies, records != NULL);
 }