=== modified file 'TODO'
--- a/TODO	2008-02-15 14:12:07 +0000
+++ b/TODO	2008-03-01 04:37:03 +0000
@@ -78,3 +78,5 @@
     is passed in to an Operation. Then on transaction execute, you have 
     Transaction call the NdbOperationsProcessor for each resultSet it has, 
     and have it return a list of unprocessed ResultSets. 
+
+  Look at AbortOption and ExecType bollocks.

=== modified file 'interface/ndbapi/NdbClusterConnection.i'
--- a/interface/ndbapi/NdbClusterConnection.i	2008-02-20 21:39:51 +0000
+++ b/interface/ndbapi/NdbClusterConnection.i	2008-03-01 04:27:22 +0000
@@ -17,13 +17,6 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-// Need to do this here so it doesn't get overridden
-#if defined(SWIGJAVA)
-  %rename Ndb_cluster_connection NdbClusterConnectionImpl; 
-#else
-  %rename Ndb_cluster_connection NdbClusterConnection; 
-#endif
-
 class Ndb_cluster_connection {
 
 

=== modified file 'interface/ndbapi/ndbglobals.i'
--- a/interface/ndbapi/ndbglobals.i	2008-02-16 17:04:54 +0000
+++ b/interface/ndbapi/ndbglobals.i	2008-03-01 04:27:22 +0000
@@ -21,12 +21,14 @@
 %include "config.h"
 
 %{
+
 #include <my_global.h>
 #include <my_sys.h>
 
 #include <mysql.h>
-#include <NdbApi.hpp> 
+#include <NdbApi.hpp>
 
+/* These get included in mysql.h. Not sure they should... */
 #undef PACKAGE
 #undef PACKAGE_NAME
 #undef PACKAGE_STRING
@@ -36,10 +38,8 @@
 
 #include "config.h"
 
-//#include <m_ctype.h>
-
-
-  long long getMicroTime() 
+
+  long long getMicroTime()
   {
     struct timeval tTime;
     gettimeofday(&tTime, 0);
@@ -48,29 +48,27 @@
   }
 
 
-
-typedef int voidint; 
+/* voidint is a way to mark a method that returns int for SWIG
+   to tell it we want the wrapped function to return void, but
+   we don't want to discard the return value out of hand because
+   we need it at the wrapping layer to find errors */
+typedef int voidint;
 typedef Uint32 NdbTimestamp;
 
-typedef NdbDictionary::Object NdbDictObject;
-typedef NdbDictionary::Table NdbDictTable;
-typedef NdbDictionary::Column NdbDictColumn;
-typedef NdbDictionary::Index NdbDictIndex;
-typedef NdbDictionary::Dictionary NdbDictDictionary;
-typedef NdbDictionary::Event NdbDictEvent;
-typedef struct st_byte { 
-  char * theString; 
-  int theLength; 
-} BYTES; 
+
+typedef struct st_byte {
+  char * theString;
+  int theLength;
+} BYTES;
 
 class NdbDateTime
 {
-  public: 
+  public:
     unsigned int  year, month, day, hour, minute, second;
     NdbDateTime();
 };
 
-NdbDateTime::NdbDateTime() { 
+NdbDateTime::NdbDateTime() {
   year=0;
   month=0;
   day=0;
@@ -79,21 +77,21 @@
   second=0;
 }
 
+/* We don't just typedef these right in the first place
+   because there because that would mean NdbDictionary::Dictionary
+   would get renamed to NdbDictionary at the C level, which
+   wouldn't work out so well. */
+
+typedef NdbDictionary::Object NdbDictObject;
+typedef NdbDictionary::Table NdbDictTable;
+typedef NdbDictionary::Column NdbDictColumn;
+typedef NdbDictionary::Index NdbDictIndex;
+typedef NdbDictionary::Dictionary NdbDictDictionary;
+typedef NdbDictionary::Event NdbDictEvent;
+
+
 %}
 
-long long getMicroTime();
-/*
-typedef char my_bool;
-enum enum_mysql_timestamp_type
-{
-  MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
-  MYSQL_TIMESTAMP_DATE= 0, MYSQL_TIMESTAMP_DATETIME= 1, MYSQL_TIMESTAMP_TIME= 2
-};
-*/
-
-
-// TODO: This is a little stupid. 
-//   Why don't we just typedef these right in the first place
 %rename(NdbObject) NdbDictObject;
 %rename(NdbTable) NdbDictTable;
 %rename(NdbColumn) NdbDictColumn;
@@ -101,6 +99,11 @@
 %rename(NdbDictionary) NdbDictDictionary;
 %rename(NdbEvent) NdbDictEvent;
 
+/* Do this here so we can override it in the Java interface */
+%rename(Ndb_cluster_connection) NdbClusterConnection;
+
+long long getMicroTime();
+
 
 enum AbortOption {
   CommitIfFailFree = 0,         

=== modified file 'java/swig/NdbClusterConnection.i'
--- a/java/swig/NdbClusterConnection.i	2008-02-16 17:04:54 +0000
+++ b/java/swig/NdbClusterConnection.i	2008-03-01 04:27:22 +0000
@@ -17,6 +17,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+%rename Ndb_cluster_connection NdbClusterConnectionImpl; 
 
 %typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection";