--no commit message

--no commit message

h2/src/main/org/h2/expression/Function.java

@@ -16,7 +16,6 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.h2.engine.Constants;
 import org.h2.engine.Database;
 import org.h2.engine.Mode;
 import org.h2.engine.Session;
@@ -684,7 +683,9 @@ public class Function extends Expression implements FunctionCall {
         case DATEDIFF:
             return ValueLong.get(datediff(v0.getString(), v1.getTimestampNoCopy(), v2.getTimestampNoCopy()));
         case DAYNAME:
+        	synchronized(FORMAT_DAYNAME) {
         		return ValueString.get(FORMAT_DAYNAME.format(v0.getDateNoCopy()));
+        	}
         case DAYOFMONTH:
             return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.DAY_OF_MONTH));
         case DAYOFWEEK:
@@ -698,7 +699,9 @@ public class Function extends Expression implements FunctionCall {
         case MONTH:
             return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.MONTH));
         case MONTHNAME:
+        	synchronized(FORMAT_MONTHNAME) {
         		return ValueString.get(FORMAT_MONTHNAME.format(v0.getDateNoCopy()));
+        	}
         case QUARTER:
             return ValueInt.get((getDatePart(v0.getTimestamp(), Calendar.MONTH) - 1) / 3 + 1);
         case SECOND:
@@ -1375,9 +1378,6 @@ public class Function extends Expression implements FunctionCall {
             precision = 0;
             scale = 0;
         }
-        if(Constants.CHECK && dataType == Value.NULL) {
-            throw Message.getInternalError("type NULL: " + getSQL());
-        }
         if(allConst) {
             return ValueExpression.get(getValue(session));
         }

h2/src/main/org/h2/message/TraceSystem.java

@@ -114,8 +114,10 @@ public class TraceSystem {
     }
 
     private String format(String module, String s) {
+    	synchronized(dateFormat) {
     		return dateFormat.format(new Date()) + module + ": " + s;
     	}
+    }
 
     void write(int l, String module, String s, Throwable t) {
         if (l <= levelSystemOut) {

h2/src/main/org/h2/server/OdbcServer.java

@@ -69,7 +69,7 @@ public class OdbcServer implements Service {
             }
         }
         org.h2.Driver.load();
-        url = "tcp://localhost:" + port;
+        url = "odbc://localhost:" + port;
     }
 
     public String getURL() {

h2/src/main/org/h2/server/ftp/FtpServer.java

@@ -98,19 +98,27 @@ public class FtpServer implements Service {
         buff.append(size);
         buff.append(' ');
         Date now = new Date(), mod = new Date(f.lastModified());
+        String date;
         if(mod.after(now) || Math.abs((now.getTime() - mod.getTime())/1000/60/60/24) > 180) {
-            buff.append(dateFormatOld.format(mod));
+        	synchronized(dateFormatOld) {
+        		date = dateFormatOld.format(mod);
+        	}
         } else {
-            buff.append(dateFormatNew.format(mod));
+        	synchronized(dateFormatNew) {
+        		date = dateFormatNew.format(mod);
+        	}
         }
+        buff.append(date);
         buff.append(' ');
         buff.append(f.getName());
         buff.append("\r\n");
     }
 
     String formatLastModified(FileObject file) {
+    	synchronized(dateFormat) {
     		return dateFormat.format(new Date(file.lastModified()));
     	}
+    }     
     
     FileObject getFile(String path) {
         if(path.indexOf("..") > 0) {