--- DatabaseMetaData.java.old	2004-01-25 03:00:12.000000000 +0300
+++ DatabaseMetaData.java	2004-01-28 16:33:44.000000000 +0300
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
+import java.io.UnsupportedEncodingException;
 
 
 /**
@@ -3366,7 +3367,14 @@
                 row = new byte[5][];
                 row[0] = connectionCatalogAsBytes;
                 row[1] = null;
-                row[2] = name.getBytes();
+				try
+				{
+					row[2] = name.getBytes(conn.getEncoding());
+				}
+				catch(UnsupportedEncodingException ex1)
+				{
+					row[2] = name.getBytes();
+				}
                 row[3] = TABLE_AS_BYTES;
                 row[4] = new byte[0];
                 tuples.add(row);