=== modified file 'interface/ndbapi/NdbRecAttr.i'
--- a/interface/ndbapi/NdbRecAttr.i	2008-03-05 16:01:55 +0000
+++ b/interface/ndbapi/NdbRecAttr.i	2008-03-06 09:43:35 +0000
@@ -1,12 +1,12 @@
-// -*- mode: c++ -*- 
+// -*- mode: c++ -*-
 /*  ndb-bindings: Wrappers for the NDB API
     Copyright (C) 2006 MySQL, Inc.
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or 
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
-    
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20,13 +20,13 @@
 %newobject NdbRecAttr::getString();
 
 
-class NdbRecAttr { 
+class NdbRecAttr {
   NdbRecAttr(Ndb*);
 
 public:
   ~NdbRecAttr();
 
-  int isNULL(); 
+  int isNULL();
 
 #if !defined(SWIG_RUBY_AUTORENAME)
   %rename(getInt64) int64_value();
@@ -57,18 +57,18 @@
     $action
   }
 
-  Int64 int64_value();  
-  Int32 int32_value();  
+  Int64 int64_value();
+  Int32 int32_value();
   short short_value();
-  char  char_value();           
-  const unsigned long long u_64_value() const;          
-  const unsigned long u_32_value();          
+  char  char_value();
+  const unsigned long long u_64_value() const;
+  const unsigned long u_32_value();
   const unsigned short u_short_value() const;
-  const unsigned char u_char_value() const;        
-  float float_value() const;         
-  double double_value() const;        
-  
-  char* aRef() const;  
+  const unsigned char u_char_value() const;
+  float float_value() const;
+  double double_value() const;
+
+  char* aRef() const;
 
   %ndbnoexception;
 
@@ -78,12 +78,12 @@
   Uint32 get_size_in_bytes() const;
 };
 
-%extend NdbRecAttr { 
+%extend NdbRecAttr {
 
 #define uint2korr(A)(short) (((short) ((unsigned char) (A)[0])) +\
   ((short) ((unsigned char) (A)[1]) << 8))
 
-  int getColType() const { 
+  int getColType() const {
     NdbDictionary::Column::Type x = self->getType();
     int y = (int)x;
     return y;
@@ -91,38 +91,37 @@
 
   %ndbexception("NdbApiException") {
     $action
-      if ( (result.theNumbers == NULL) || 
-           (result.thePrecision == -1) || 
-           (result.theScale == -1)
-         )  { 
-         NDB_exception(NdbApiException,"Error fetching data");
+      if ( (result.theNumbers == NULL) ||
+	   (result.thePrecision == -1) ||
+	   (result.theScale == -1)
+	   )  {
+	NDB_exception(NdbApiException,"Error fetching data");
       }
   }
 
-  DECIMAL getDecimal() { 
+  DECIMAL getDecimal() {
     NdbDictionary::Column::Type colType = self->getType();
-    DECIMAL output; 
+    DECIMAL output;
     output.theNumbers=NULL;
     output.thePrecision=-1;
     output.theScale=1;
 
     char* rec = self->aRef();
     if(colType == NdbDictionary::Column::Decimal) {
-
     }
     return output;
 
-  } 
+  }
 
   %ndbexception("NdbApiException") {
     $action
-      if ( (result.theString == NULL) || (result.theLength == -1) )  { 
+      if ( (result.theString == NULL) || (result.theLength == -1) )  {
 	NDB_exception(NdbApiException,"Error fetching data");
       }
   }
-  BYTES getBytes() { 
+  BYTES getBytes() {
     NdbDictionary::Column::Type colType = self->getType();
-    BYTES output; 
+    BYTES output;
     output.theString=NULL;
     output.theLength=-1;
 
@@ -131,54 +130,44 @@
     if(colType == NdbDictionary::Column::Longvarbinary)
       {
 	output.theLength=(int)uint2korr(rec);
-        output.theString = &rec[2];
-/*
-	jbyteArray bArray = env->NewByteArray(len); 
-	env->SetByteArrayRegion(bArray,0,len,(const jbyte*) &self->aRef()[2]);
-	return bArray; */
-      } 
+	output.theString = &rec[2];
+      }
     else if(colType == NdbDictionary::Column::Varbinary)
     {
 
       output.theLength = (int) (rec[0]);
       output.theString = &rec[1];
-      /*jbyteArray bArray = env->NewByteArray(len); 
-      env->SetByteArrayRegion(bArray,0,len,(const jbyte*) &self->aRef()[1]);
-      return bArray; */
     }
     else if( colType == NdbDictionary::Column::Binary)
     {
       output.theLength = strlen(rec)-1;
-      output.theString = &rec[0]; 
-     /* jbyteArray bArray = env->NewByteArray(i); 
-      env->SetByteArrayRegion(bArray,0,i,(const jbyte*) &self->aRef()[0]);
-      return bArray; */
+      output.theString = &rec[0];
     }
-    return output; 
+    return output;
   }
 
   %ndbexception("NdbApiException") {
     $action
-      if (result == NULL) { 
+      if (result == NULL) {
 	NDB_exception(NdbApiException,"Error fetching data");
       }
   }
 
-  const char* getString() { 
+  const char* getString() {
     NdbDictionary::Column::Type colType = self->getType();
 
     char* ref = self->aRef();
 
-    if(colType == NdbDictionary::Column::Longvarchar) 
+    if(colType == NdbDictionary::Column::Longvarchar)
       {
-        int len=(int)uint2korr(ref);
-        char * buff = (char *)malloc(len+1);
-        memset(buff,0,len+1);
+	int len=(int)uint2korr(ref);
+	char * buff = (char *)malloc(len+1);
+	memset(buff,0,len+1);
 	ref+=2;
-        memcpy(buff,ref,len);
-        buff[len+1]='\0';
-        return buff;
-      } 
+	memcpy(buff,ref,len);
+	buff[len+1]='\0';
+	return buff;
+      }
     else if(colType == NdbDictionary::Column::Varchar)
     {
       short len = (short) (unsigned char) (ref[0]);
@@ -188,20 +177,19 @@
       buff[len+1]='\0';
       return buff;
     }
-    else if(colType == NdbDictionary::Column::Char) 
+    else if(colType == NdbDictionary::Column::Char)
     {
-      
       int len=strlen(ref);
       int i=len-1;
       /**
        * truncate spaces...
        */
       while(ref[i] == ' ')
-        {
-          i--;
-        }
+      {
+	i--;
+      }
       i++;  //length of string until space padding starts..
-      char * buff = (char *)malloc(i+1); //+1 for null; 
+      char * buff = (char *)malloc(i+1); //+1 for null;
       memcpy(buff, ref, i);
       buff[i]='\0';
       return buff;
@@ -210,7 +198,7 @@
   }
 
   %ndbnoexception;
-  NdbDateTime * getDatetime() { 
+  NdbDateTime * getDatetime() {
     return  new NdbDateTime();
   }
 
@@ -218,7 +206,7 @@
     $action
   }
 
-  NdbTimestamp getTimestamp() { 
+  NdbTimestamp getTimestamp() {
     return (NdbTimestamp)(self->u_32_value());
   }
 

=== modified file 'java/swig/decimal.i'
--- a/java/swig/decimal.i	2008-03-06 09:19:27 +0000
+++ b/java/swig/decimal.i	2008-03-06 09:43:35 +0000
@@ -20,17 +20,17 @@
 /* Skipping jni and jtype typemaps because we're letting SWIG handle it */
 %typemap(jstype) DECIMAL "java.math.BigDecimal"
 %typemap(javaout) DECIMAL {
-  DECIMAL theDecimal = new DECIMAL($jnicall, false);
-  java.math.BigDecimal results = new java.math.BigDecimal(0);
-  int[] theNumbers = theDecimal.getTheNumbers();
-  java.math.BigDecimal baseTen = new java.math.BigDecimal(10);
-  for (int x=0; x<theNumbers.length; x++) {
-	  java.math.BigDecimal newNumber =
-	    new java.math.BigDecimal(theNumbers[x]);
-	  java.math.BigDecimal tenShift = baseTen.pow(x*8);
-	  results.add(newNumber.multiply(tenShift));
-  }
-  return results.setScale(theDecimal.getTheScale());
+    DECIMAL theDecimal = new DECIMAL($jnicall, false);
+    java.math.BigDecimal results = new java.math.BigDecimal(0);
+    int[] theNumbers = theDecimal.getTheNumbers();
+    java.math.BigDecimal baseTen = new java.math.BigDecimal(10);
+    for (int x=0; x<theNumbers.length; x++) {
+        java.math.BigDecimal newNumber =
+	  new java.math.BigDecimal(theNumbers[x]);
+        java.math.BigDecimal tenShift = baseTen.pow(x*8);
+        results.add(newNumber.multiply(tenShift));
+    }
+    return results.setScale(theDecimal.getTheScale());
 
 }
 

=== modified file 'java/swig/input_string.i'
--- a/java/swig/input_string.i	2008-03-04 13:18:48 +0000
+++ b/java/swig/input_string.i	2008-03-06 09:43:35 +0000
@@ -20,7 +20,7 @@
 %typemap(in) (const char* anInputString, size_t len) {
   /* Check that we are getting a string */
   if ($input==NULL) {
-    $1 = "";
+    $1 = (char *)"";
     $2 = 0;
   } else {
     $1 = (char *)(jenv->GetStringUTFChars($input,0));