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

[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-12 15:52:42-04:00, jas@stripped +2 -0
  Make environment neutral definition for int64s.

  storage/falcon/InfoTable.cpp@stripped, 2007-04-12 15:52:39-04:00,
jas@stripped +1 -1
    Make environment neutral definition for int64s.

  storage/falcon/InfoTable.h@stripped, 2007-04-12 15:52:40-04:00,
jas@stripped +7 -1
    Make environment neutral definition for int64s.

# 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.3/storage/falcon/InfoTable.cpp	2007-04-12 15:52:49 -04:00
+++ 1.4/storage/falcon/InfoTable.cpp	2007-04-12 15:52:49 -04:00
@@ -50,7 +50,7 @@
 	table->field[column]->store(string, strlen(string), charSetInfo);
 }
 
-void InfoTable::putInt64(int column, int64 value)
+void InfoTable::putInt64(int column, INT64 value)
 {
 	table->field[column]->store(value, false);
 }

--- 1.2/storage/falcon/InfoTable.h	2007-04-12 15:52:49 -04:00
+++ 1.3/storage/falcon/InfoTable.h	2007-04-12 15:52:49 -04:00
@@ -17,6 +17,12 @@
 #ifndef _INFO_TABLE_H_
 #define _INFO_TABLE_H_
 
+#ifdef _WIN32
+typedef __int64 INT64;
+#else
+typedef long long INT64;
+#endif
+
 class THD;
 struct charset_info_st;
 struct st_table_list;
@@ -30,7 +36,7 @@
 	
 	void	putRecord(void);
 	void	putInt(int column, int value);
-	void	putInt64(int column, int64 value);
+	void	putInt64(int column, INT64 value);
 	void	putString(int column, const char *string);
 	
 	int				error;