diff --git a/src/main/java/org/drizzle/jdbc/CommonDatabaseMetaData.java b/src/main/java/org/drizzle/jdbc/CommonDatabaseMetaData.java
index 972cf68..7b8a029 100644
--- a/src/main/java/org/drizzle/jdbc/CommonDatabaseMetaData.java
+++ b/src/main/java/org/drizzle/jdbc/CommonDatabaseMetaData.java
@@ -2419,7 +2419,7 @@ public int getResultSetHoldability() throws SQLException {
      * @since 1.4
      */
     public int getDatabaseMajorVersion() throws SQLException {
-        return 0;
+        return Integer.parseInt(version.split("\\.")[0]);
     }
 
     /**
@@ -2430,7 +2430,7 @@ public int getDatabaseMajorVersion() throws SQLException {
      * @since 1.4
      */
     public int getDatabaseMinorVersion() throws SQLException {
-        return 1;
+        return version.split("\\.").length > 1 ? Integer.parseInt(version.split("\\.")[1]) : 0 ;
     }
 
     /**
diff --git a/src/main/java/org/drizzle/jdbc/DrizzleConnection.java b/src/main/java/org/drizzle/jdbc/DrizzleConnection.java
index 6ef17b7..5fc51df 100644
--- a/src/main/java/org/drizzle/jdbc/DrizzleConnection.java
+++ b/src/main/java/org/drizzle/jdbc/DrizzleConnection.java
@@ -382,7 +382,8 @@ public void setTransactionIsolation(final int level) throws SQLException {
     public int getTransactionIsolation() throws SQLException {
         final Statement stmt = createStatement();
         try {
-            final ResultSet rs = stmt.executeQuery("SELECT @@tx_isolation");
+            String tx_isolation = Integer.parseInt(protocol.getServerVersion().split("\\.")[0]) >= 8 ? "SELECT @@transaction_isolation":"SELECT @@tx_isolation" ;
+            final ResultSet rs = stmt.executeQuery(tx_isolation);
             rs.next();
             final String response = rs.getString(1);
             if (response.equals("REPEATABLE-READ")) {