Issue 486: MySQL compatibiltity, support the "DEFAULT CHARSET" part of the CREATE TABLE statement.

h2/src/docsrc/html/changelog.html

@@ -58,6 +58,7 @@ Change Log
 </li><li>Issue 484: In the H2 Console tool, all schemas starting with "INFO" where hidden.
     Now they are hidden only if the database is not H2. Patch from "mgcodeact"/"cumer d"
 </li><li>MySQL compatibiltity, support the "AUTO_INCREMENT=3" part of the CREATE TABLE statement.
+</li><li>Issue 486: MySQL compatibiltity, support the "DEFAULT CHARSET" part of the CREATE TABLE statement.
 </li></ul>
 
 <h2>Version 1.3.172 (2013-05-25)</h2>

h2/src/main/org/h2/command/Parser.java

@@ -5404,6 +5404,7 @@ public class Parser {
             }
             read();
         }
+        readIf("DEFAULT");
         if (readIf("CHARSET")) {
             read("=");
             read("UTF8");

h2/src/test/org/h2/test/db/TestCompatibility.java

@@ -264,7 +264,8 @@ public class TestCompatibility extends TestBase {
         stat.execute("CREATE TABLE TEST_2(ID INT PRIMARY KEY) ENGINE=MyISAM");
         stat.execute("CREATE TABLE TEST_3(ID INT PRIMARY KEY) ENGINE=InnoDb charset=UTF8");
         stat.execute("CREATE TABLE TEST_4(ID INT PRIMARY KEY) charset=UTF8");
-        stat.execute("CREATE TABLE TEST_5(ID INT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 charset=UTF8");
+        stat.execute("CREATE TABLE TEST_5(ID INT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 default charset=UTF8");
+        stat.execute("CREATE TABLE TEST_6(ID INT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 charset=UTF8");
 
         // Check if mysql comments are supported, ensure clean connection
         conn.close();