Merge branch 'develop' into feature/CONJ-325

mariadb-corporation · Aug 2, 2016 · 62cc603 · 62cc603
2 parents 415aa37 + 037eab1
commit 62cc603
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/test/java/org/mariadb/jdbc/DatatypeTest.java b/src/test/java/org/mariadb/jdbc/DatatypeTest.java
@@ -96,9 +96,8 @@ public void datatypes(Connection connection, boolean tinyInt1isBit, boolean year
                         + "date0 DATE default '2001-01-01',"
                         + "datetime0 DATETIME default '2001-01-01 00:00:00',"
                         + "timestamp0 TIMESTAMP default  '2001-01-01 00:00:00',"
-                        + "timestamp_zero TIMESTAMP,"
                         + "time0 TIME default '22:11:00',"
-                        + ((!isMariadbServer() && minVersion(5, 6)) ? "year2 YEAR(4) default 99," : "year2 YEAR(2) default 99,")
+                        + ((minVersion(5, 6) && beforeVersion(10, 0)) ? "year2 YEAR(4) default 99," : "year2 YEAR(2) default 99,")
                         + "year4 YEAR(4) default 2011,"
                         + "char0 CHAR(1) default '0',"
                         + "char_binary CHAR (1) binary default '0',"
@@ -149,7 +148,6 @@ public void datatypes(Connection connection, boolean tinyInt1isBit, boolean year
         checkClass("date0", Date.class, "DATE", Types.DATE);
         checkClass("time0", Time.class, "TIME", Types.TIME);
         checkClass("timestamp0", Timestamp.class, "TIMESTAMP", Types.TIMESTAMP);
-        checkClass("timestamp_zero", Timestamp.class, "TIMESTAMP", Types.TIMESTAMP);
 
         if (minVersion(5, 6) && beforeVersion(10, 0)) {
             //MySQL deprecated YEAR(2) since 5.6