diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
index dd27882e7b..82edab50a0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
@@ -40,11 +40,11 @@ import static org.jooq.impl.DSL.inline;
 import static org.jooq.util.mysql.information_schema.Tables.COLUMNS;
 import static org.jooq.util.mysql.information_schema.Tables.KEY_COLUMN_USAGE;
 import static org.jooq.util.mysql.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
+import static org.jooq.util.mysql.information_schema.Tables.ROUTINES;
 import static org.jooq.util.mysql.information_schema.Tables.SCHEMATA;
 import static org.jooq.util.mysql.information_schema.Tables.STATISTICS;
 import static org.jooq.util.mysql.information_schema.Tables.TABLES;
-import static org.jooq.util.mysql.mysql.tables.Proc.DB;
-import static org.jooq.util.mysql.mysql.tables.Proc.PROC;
+import static org.jooq.util.mysql.mysql.Tables.PROC;
 
 import java.io.StringReader;
 import java.sql.SQLException;
@@ -87,6 +87,7 @@ import org.jooq.util.UDTDefinition;
 import org.jooq.util.mysql.information_schema.tables.Columns;
 import org.jooq.util.mysql.information_schema.tables.KeyColumnUsage;
 import org.jooq.util.mysql.information_schema.tables.ReferentialConstraints;
+import org.jooq.util.mysql.information_schema.tables.Routines;
 import org.jooq.util.mysql.information_schema.tables.Schemata;
 import org.jooq.util.mysql.information_schema.tables.Statistics;
 import org.jooq.util.mysql.information_schema.tables.Tables;
@@ -99,6 +100,7 @@ import org.jooq.util.mysql.mysql.tables.Proc;
 public class MySQLDatabase extends AbstractDatabase {
 
     private static final JooqLogger log = JooqLogger.getLogger(MySQLDatabase.class);
+    private static Boolean          is8;
 
     @Override
     protected List<IndexDefinition> getIndexes0() throws SQLException {
@@ -210,6 +212,22 @@ public class MySQLDatabase extends AbstractDatabase {
         return "KEY_" + tableName + "_" + keyName;
     }
 
+    private boolean is8() {
+        if (is8 == null) {
+
+            // [#6602] The mysql.proc table got removed in MySQL 8.0
+            try {
+                create(true).fetchExists(PROC);
+                is8 = false;
+            }
+            catch (DataAccessException ignore) {
+                is8 = true;
+            }
+        }
+
+        return is8;
+    }
+
     private Result<Record4<String, String, String, String>> fetchKeys(boolean primary) {
 
         // [#3560] It has been shown that querying the STATISTICS table is much faster on
@@ -227,7 +245,7 @@ public class MySQLDatabase extends AbstractDatabase {
                            : falseCondition()))
                        .and(primary
                            ? Statistics.INDEX_NAME.eq(inline("PRIMARY"))
-                           : Statistics.INDEX_NAME.ne(inline("PRIMARY")).and(Statistics.NON_UNIQUE.eq(inline(0L))))
+                           : Statistics.INDEX_NAME.ne(inline("PRIMARY")).and(Statistics.NON_UNIQUE.eq(inline("0"))))
                        .orderBy(
                            Statistics.TABLE_SCHEMA,
                            Statistics.TABLE_NAME,
@@ -433,31 +451,34 @@ public class MySQLDatabase extends AbstractDatabase {
     protected List<RoutineDefinition> getRoutines0() throws SQLException {
         List<RoutineDefinition> result = new ArrayList<RoutineDefinition>();
 
-        try {
-            create(true).fetchCount(PROC);
-        }
-        catch (DataAccessException e) {
-            log.warn("Table unavailable", "The `mysql`.`proc` table is unavailable. Stored procedures cannot be loaded. Check if you have sufficient grants");
-            return result;
-        }
+        Result<Record6<String, String, String, byte[], byte[], ProcType>> records = is8()
 
-        Result<Record6<String, String, String, byte[], byte[], ProcType>> records =
-        create().select(
-                    Proc.DB,
-                    Proc.NAME,
-                    Proc.COMMENT,
+            ? create().select(
+                    Routines.ROUTINE_SCHEMA,
+                    Routines.ROUTINE_NAME,
+                    Routines.ROUTINE_COMMENT,
+                    inline(new byte[0]).as(Proc.PARAM_LIST),
+                    inline(new byte[0]).as(Proc.RETURNS),
+                    Routines.ROUTINE_TYPE.coerce(Proc.TYPE).as(Routines.ROUTINE_TYPE))
+                .from(ROUTINES)
+                .where(Routines.ROUTINE_SCHEMA.in(getInputSchemata()))
+                .orderBy(1, 2, 6)
+                .fetch()
+
+            : create().select(
+                    Proc.DB.as(Routines.ROUTINE_SCHEMA),
+                    Proc.NAME.as(Routines.ROUTINE_NAME),
+                    Proc.COMMENT.as(Routines.ROUTINE_COMMENT),
                     Proc.PARAM_LIST,
                     Proc.RETURNS,
-                    Proc.TYPE)
+                    Proc.TYPE.as(Routines.ROUTINE_TYPE))
                 .from(PROC)
-                .where(DB.in(getInputSchemata()))
-                .orderBy(
-                    DB,
-                    Proc.NAME)
+                .where(Proc.DB.in(getInputSchemata()))
+                .orderBy(1, 2, 6)
                 .fetch();
 
         Map<Record, Result<Record6<String, String, String, byte[], byte[], ProcType>>> groups =
-            records.intoGroups(new Field[] { Proc.DB, Proc.NAME });
+            records.intoGroups(new Field[] { Routines.ROUTINE_SCHEMA, Routines.ROUTINE_NAME });
 
         // [#1908] This indirection is necessary as MySQL allows for overloading
         // procedures and functions with the same signature.
@@ -467,19 +488,17 @@ public class MySQLDatabase extends AbstractDatabase {
             for (int i = 0; i < overloads.size(); i++) {
                 Record record = overloads.get(i);
 
-                SchemaDefinition schema = getSchema(record.get(DB));
-                String name = record.get(Proc.NAME);
-                String comment = record.get(Proc.COMMENT);
-                String params = new String(record.get(Proc.PARAM_LIST));
-                String returns = new String(record.get(Proc.RETURNS));
-                ProcType type = record.get(Proc.TYPE);
+                SchemaDefinition schema = getSchema(record.get(Routines.ROUTINE_SCHEMA));
+                String name = record.get(Routines.ROUTINE_NAME);
+                String comment = record.get(Routines.ROUTINE_COMMENT);
+                String params = is8() ? "" : new String(record.get(Proc.PARAM_LIST));
+                String returns = is8() ? "" : new String(record.get(Proc.RETURNS));
+                ProcType type = record.get(Routines.ROUTINE_TYPE.coerce(Proc.TYPE).as(Routines.ROUTINE_TYPE));
 
-                if (overloads.size() > 1) {
+                if (overloads.size() > 1)
                     result.add(new MySQLRoutineDefinition(schema, name, comment, params, returns, type, "_" + type.name()));
-                }
-                else {
+                else
                     result.add(new MySQLRoutineDefinition(schema, name, comment, params, returns, type, null));
-                }
             }
         }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java
index 3f3c67a654..82e2040735 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java
@@ -57,10 +57,10 @@ import org.jooq.util.mysql.mysql.enums.ProcType;
  */
 public class MySQLRoutineDefinition extends AbstractRoutineDefinition {
 
-    private Boolean is55;
+    private static Boolean is55;
 
-    private final String params;
-    private final String returns;
+    private final String   params;
+    private final String   returns;
     private final ProcType procType;
 
     /**
@@ -81,12 +81,10 @@ public class MySQLRoutineDefinition extends AbstractRoutineDefinition {
 
     @Override
     protected void init0() {
-        if (is55()) {
+        if (is55())
             init55();
-        }
-        else {
+        else
             init54();
-        }
     }
 
     private void init55() {
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/DefaultCatalog.java
new file mode 100644
index 0000000000..9e49fc3327
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/DefaultCatalog.java
@@ -0,0 +1,60 @@
+/*
+ * This file is generated by jOOQ.
+*/
+package org.jooq.util.mysql.information_schema;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.jooq.Schema;
+import org.jooq.impl.CatalogImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class DefaultCatalog extends CatalogImpl {
+
+    private static final long serialVersionUID = 1455765431;
+
+    /**
+     * The reference instance of <code></code>
+     */
+    public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
+
+    /**
+     * The schema <code>information_schema</code>.
+     */
+    public final InformationSchema INFORMATION_SCHEMA = org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA;
+
+    /**
+     * No further instances allowed
+     */
+    private DefaultCatalog() {
+        super("");
+    }
+
+    @Override
+    public final List<Schema> getSchemas() {
+        List result = new ArrayList();
+        result.addAll(getSchemas0());
+        return result;
+    }
+
+    private final List<Schema> getSchemas0() {
+        return Arrays.<Schema>asList(
+            InformationSchema.INFORMATION_SCHEMA);
+    }
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
index 8080a4e069..435a7ab7f6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
@@ -1,46 +1,127 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema;
 
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.jooq.Catalog;
+import org.jooq.Table;
+import org.jooq.impl.SchemaImpl;
+import org.jooq.util.mysql.information_schema.tables.Columns;
+import org.jooq.util.mysql.information_schema.tables.KeyColumnUsage;
+import org.jooq.util.mysql.information_schema.tables.Parameters;
+import org.jooq.util.mysql.information_schema.tables.ReferentialConstraints;
+import org.jooq.util.mysql.information_schema.tables.Routines;
+import org.jooq.util.mysql.information_schema.tables.Schemata;
+import org.jooq.util.mysql.information_schema.tables.Statistics;
+import org.jooq.util.mysql.information_schema.tables.TableConstraints;
+import org.jooq.util.mysql.information_schema.tables.Tables;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class InformationSchema extends org.jooq.impl.SchemaImpl {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class InformationSchema extends SchemaImpl {
 
-	private static final long serialVersionUID = -679998315;
+    private static final long serialVersionUID = 621475927;
 
-	/**
-	 * The singleton instance of <code>information_schema</code>
-	 */
-	public static final InformationSchema INFORMATION_SCHEMA = new InformationSchema();
+    /**
+     * The reference instance of <code>information_schema</code>
+     */
+    public static final InformationSchema INFORMATION_SCHEMA = new InformationSchema();
 
-	/**
-	 * No further instances allowed
-	 */
-	private InformationSchema() {
-		super("information_schema");
-	}
+    /**
+     * The table <code>information_schema.COLUMNS</code>.
+     */
+    public final Columns COLUMNS = org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS;
 
-	@Override
-	public final java.util.List<org.jooq.Table<?>> getTables() {
-		java.util.List result = new java.util.ArrayList();
-		result.addAll(getTables0());
-		return result;
-	}
+    /**
+     * The table <code>information_schema.KEY_COLUMN_USAGE</code>.
+     */
+    public final KeyColumnUsage KEY_COLUMN_USAGE = org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE;
 
-	private final java.util.List<org.jooq.Table<?>> getTables0() {
-		return java.util.Arrays.<org.jooq.Table<?>>asList(
-			org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS,
-			org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE,
-			org.jooq.util.mysql.information_schema.tables.Parameters.PARAMETERS,
-			org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
-			org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA,
-			org.jooq.util.mysql.information_schema.tables.Statistics.STATISTICS,
-			org.jooq.util.mysql.information_schema.tables.Tables.TABLES,
-			org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
-	}
+    /**
+     * The table <code>information_schema.PARAMETERS</code>.
+     */
+    public final Parameters PARAMETERS = org.jooq.util.mysql.information_schema.tables.Parameters.PARAMETERS;
+
+    /**
+     * The table <code>information_schema.REFERENTIAL_CONSTRAINTS</code>.
+     */
+    public final ReferentialConstraints REFERENTIAL_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS;
+
+    /**
+     * The table <code>information_schema.ROUTINES</code>.
+     */
+    public final Routines ROUTINES = org.jooq.util.mysql.information_schema.tables.Routines.ROUTINES;
+
+    /**
+     * The table <code>information_schema.SCHEMATA</code>.
+     */
+    public final Schemata SCHEMATA = org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA;
+
+    /**
+     * The table <code>information_schema.STATISTICS</code>.
+     */
+    public final Statistics STATISTICS = org.jooq.util.mysql.information_schema.tables.Statistics.STATISTICS;
+
+    /**
+     * The table <code>information_schema.TABLES</code>.
+     */
+    public final Tables TABLES = org.jooq.util.mysql.information_schema.tables.Tables.TABLES;
+
+    /**
+     * The table <code>information_schema.TABLE_CONSTRAINTS</code>.
+     */
+    public final TableConstraints TABLE_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS;
+
+    /**
+     * No further instances allowed
+     */
+    private InformationSchema() {
+        super("information_schema", null);
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Catalog getCatalog() {
+        return DefaultCatalog.DEFAULT_CATALOG;
+    }
+
+    @Override
+    public final List<Table<?>> getTables() {
+        List result = new ArrayList();
+        result.addAll(getTables0());
+        return result;
+    }
+
+    private final List<Table<?>> getTables0() {
+        return Arrays.<Table<?>>asList(
+            Columns.COLUMNS,
+            KeyColumnUsage.KEY_COLUMN_USAGE,
+            Parameters.PARAMETERS,
+            ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
+            Routines.ROUTINES,
+            Schemata.SCHEMATA,
+            Statistics.STATISTICS,
+            Tables.TABLES,
+            TableConstraints.TABLE_CONSTRAINTS);
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
index 83fcde185d..39e7cd8644 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
@@ -1,55 +1,76 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.util.mysql.information_schema.tables.Columns;
+import org.jooq.util.mysql.information_schema.tables.KeyColumnUsage;
+import org.jooq.util.mysql.information_schema.tables.Parameters;
+import org.jooq.util.mysql.information_schema.tables.ReferentialConstraints;
+import org.jooq.util.mysql.information_schema.tables.Routines;
+import org.jooq.util.mysql.information_schema.tables.Schemata;
+import org.jooq.util.mysql.information_schema.tables.Statistics;
+import org.jooq.util.mysql.information_schema.tables.TableConstraints;
+
+
 /**
- * This class is generated by jOOQ.
- *
  * Convenience access to all tables in information_schema
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {
 
-	/**
-	 * The table information_schema.COLUMNS
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Columns COLUMNS = org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS;
+    /**
+     * The table <code>information_schema.COLUMNS</code>.
+     */
+    public static final Columns COLUMNS = org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS;
 
-	/**
-	 * The table information_schema.KEY_COLUMN_USAGE
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.KeyColumnUsage KEY_COLUMN_USAGE = org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE;
+    /**
+     * The table <code>information_schema.KEY_COLUMN_USAGE</code>.
+     */
+    public static final KeyColumnUsage KEY_COLUMN_USAGE = org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE;
 
-	/**
-	 * The table information_schema.PARAMETERS
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Parameters PARAMETERS = org.jooq.util.mysql.information_schema.tables.Parameters.PARAMETERS;
+    /**
+     * The table <code>information_schema.PARAMETERS</code>.
+     */
+    public static final Parameters PARAMETERS = org.jooq.util.mysql.information_schema.tables.Parameters.PARAMETERS;
 
-	/**
-	 * The table information_schema.REFERENTIAL_CONSTRAINTS
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.ReferentialConstraints REFERENTIAL_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS;
+    /**
+     * The table <code>information_schema.REFERENTIAL_CONSTRAINTS</code>.
+     */
+    public static final ReferentialConstraints REFERENTIAL_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS;
 
-	/**
-	 * The table information_schema.SCHEMATA
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Schemata SCHEMATA = org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA;
+    /**
+     * The table <code>information_schema.ROUTINES</code>.
+     */
+    public static final Routines ROUTINES = org.jooq.util.mysql.information_schema.tables.Routines.ROUTINES;
 
-	/**
-	 * The table information_schema.STATISTICS
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Statistics STATISTICS = org.jooq.util.mysql.information_schema.tables.Statistics.STATISTICS;
+    /**
+     * The table <code>information_schema.SCHEMATA</code>.
+     */
+    public static final Schemata SCHEMATA = org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA;
 
-	/**
-	 * The table information_schema.TABLES
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Tables TABLES = org.jooq.util.mysql.information_schema.tables.Tables.TABLES;
+    /**
+     * The table <code>information_schema.STATISTICS</code>.
+     */
+    public static final Statistics STATISTICS = org.jooq.util.mysql.information_schema.tables.Statistics.STATISTICS;
 
-	/**
-	 * The table information_schema.TABLE_CONSTRAINTS
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.TableConstraints TABLE_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS;
+    /**
+     * The table <code>information_schema.TABLES</code>.
+     */
+    public static final org.jooq.util.mysql.information_schema.tables.Tables TABLES = org.jooq.util.mysql.information_schema.tables.Tables.TABLES;
+
+    /**
+     * The table <code>information_schema.TABLE_CONSTRAINTS</code>.
+     */
+    public static final TableConstraints TABLE_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS;
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
index 5afe2b636e..c7c2f48eb8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
@@ -1,138 +1,177 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.UInteger;
+import org.jooq.types.ULong;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Columns extends TableImpl<Record> {
 
-	private static final long serialVersionUID = -1192516157;
+    private static final long serialVersionUID = -725566953;
 
-	/**
-	 * The singleton instance of <code>information_schema.COLUMNS</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Columns COLUMNS = new org.jooq.util.mysql.information_schema.tables.Columns();
+    /**
+     * The reference instance of <code>information_schema.COLUMNS</code>
+     */
+    public static final Columns COLUMNS = new Columns();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.COLUMNS.TABLE_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.TABLE_CATALOG</code>.
+     */
+    public static final TableField<Record, String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLUMN_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.COLUMN_NAME</code>.
+     */
+    public static final TableField<Record, String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.ORDINAL_POSITION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.ORDINAL_POSITION</code>.
+     */
+    public static final TableField<Record, UInteger> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLUMN_DEFAULT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_DEFAULT = createField("COLUMN_DEFAULT", org.jooq.impl.SQLDataType.CLOB, COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.COLUMN_DEFAULT</code>.
+     */
+    public static final TableField<Record, String> COLUMN_DEFAULT = createField("COLUMN_DEFAULT", org.jooq.impl.SQLDataType.CLOB, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.IS_NULLABLE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> IS_NULLABLE = createField("IS_NULLABLE", org.jooq.impl.SQLDataType.VARCHAR.length(3).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.IS_NULLABLE</code>.
+     */
+    public static final TableField<Record, String> IS_NULLABLE = createField("IS_NULLABLE", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.DATA_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DATA_TYPE = createField("DATA_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.DATA_TYPE</code>.
+     */
+    public static final TableField<Record, String> DATA_TYPE = createField("DATA_TYPE", org.jooq.impl.SQLDataType.CLOB, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.CHARACTER_MAXIMUM_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> CHARACTER_MAXIMUM_LENGTH = createField("CHARACTER_MAXIMUM_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.CHARACTER_MAXIMUM_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_MAXIMUM_LENGTH = createField("CHARACTER_MAXIMUM_LENGTH", org.jooq.impl.SQLDataType.BIGINT, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.CHARACTER_OCTET_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> CHARACTER_OCTET_LENGTH = createField("CHARACTER_OCTET_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.CHARACTER_OCTET_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_OCTET_LENGTH = createField("CHARACTER_OCTET_LENGTH", org.jooq.impl.SQLDataType.BIGINT, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.NUMERIC_PRECISION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> NUMERIC_PRECISION = createField("NUMERIC_PRECISION", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.NUMERIC_PRECISION</code>.
+     */
+    public static final TableField<Record, ULong> NUMERIC_PRECISION = createField("NUMERIC_PRECISION", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.NUMERIC_SCALE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> NUMERIC_SCALE = createField("NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.NUMERIC_SCALE</code>.
+     */
+    public static final TableField<Record, ULong> NUMERIC_SCALE = createField("NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.CHARACTER_SET_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CHARACTER_SET_NAME = createField("CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(32), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.DATETIME_PRECISION</code>.
+     */
+    public static final TableField<Record, UInteger> DATETIME_PRECISION = createField("DATETIME_PRECISION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLLATION_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLLATION_NAME = createField("COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(32), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.CHARACTER_SET_NAME</code>.
+     */
+    public static final TableField<Record, String> CHARACTER_SET_NAME = createField("CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLUMN_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_TYPE = createField("COLUMN_TYPE", org.jooq.impl.SQLDataType.CLOB.nullable(false), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.COLLATION_NAME</code>.
+     */
+    public static final TableField<Record, String> COLLATION_NAME = createField("COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLUMN_KEY</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_KEY = createField("COLUMN_KEY", org.jooq.impl.SQLDataType.VARCHAR.length(3).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.COLUMN_TYPE</code>.
+     */
+    public static final TableField<Record, String> COLUMN_TYPE = createField("COLUMN_TYPE", org.jooq.impl.SQLDataType.CLOB.nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.EXTRA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> EXTRA = createField("EXTRA", org.jooq.impl.SQLDataType.VARCHAR.length(27).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.COLUMN_KEY</code>.
+     */
+    public static final TableField<Record, String> COLUMN_KEY = createField("COLUMN_KEY", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.PRIVILEGES</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> PRIVILEGES = createField("PRIVILEGES", org.jooq.impl.SQLDataType.VARCHAR.length(80).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.EXTRA</code>.
+     */
+    public static final TableField<Record, String> EXTRA = createField("EXTRA", org.jooq.impl.SQLDataType.VARCHAR(57), COLUMNS, "");
 
-	/**
-	 * The column <code>information_schema.COLUMNS.COLUMN_COMMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_COMMENT = createField("COLUMN_COMMENT", org.jooq.impl.SQLDataType.VARCHAR.length(1024).nullable(false).defaulted(true), COLUMNS, "");
+    /**
+     * The column <code>information_schema.COLUMNS.PRIVILEGES</code>.
+     */
+    public static final TableField<Record, String> PRIVILEGES = createField("PRIVILEGES", org.jooq.impl.SQLDataType.VARCHAR(154), COLUMNS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns() {
-		this("COLUMNS", null);
-	}
+    /**
+     * The column <code>information_schema.COLUMNS.COLUMN_COMMENT</code>.
+     */
+    public static final TableField<Record, String> COLUMN_COMMENT = createField("COLUMN_COMMENT", org.jooq.impl.SQLDataType.CLOB.nullable(false), COLUMNS, "");
 
-	private Columns(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    /**
+     * The column <code>information_schema.COLUMNS.GENERATION_EXPRESSION</code>.
+     */
+    public static final TableField<Record, String> GENERATION_EXPRESSION = createField("GENERATION_EXPRESSION", org.jooq.impl.SQLDataType.CLOB.nullable(false), COLUMNS, "");
 
-	private Columns(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    /**
+     * No further instances allowed
+     */
+    private Columns() {
+        this(DSL.name("COLUMNS"), null);
+    }
+
+    private Columns(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Columns(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
index 7200918fff..662ee2b4ad 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
@@ -1,103 +1,131 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.UInteger;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class KeyColumnUsage extends TableImpl<Record> {
 
-	private static final long serialVersionUID = -669574892;
+    private static final long serialVersionUID = 1799759078;
 
-	/**
-	 * The singleton instance of <code>information_schema.KEY_COLUMN_USAGE</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.KeyColumnUsage KEY_COLUMN_USAGE = new org.jooq.util.mysql.information_schema.tables.KeyColumnUsage();
+    /**
+     * The reference instance of <code>information_schema.KEY_COLUMN_USAGE</code>
+     */
+    public static final KeyColumnUsage KEY_COLUMN_USAGE = new KeyColumnUsage();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_CATALOG</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.CONSTRAINT_NAME</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_CATALOG</code>.
+     */
+    public static final TableField<Record, String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.COLUMN_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.COLUMN_NAME</code>.
+     */
+    public static final TableField<Record, String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.ORDINAL_POSITION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaulted(true), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.ORDINAL_POSITION</code>.
+     */
+    public static final TableField<Record, UInteger> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.POSITION_IN_UNIQUE_CONSTRAINT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> POSITION_IN_UNIQUE_CONSTRAINT = createField("POSITION_IN_UNIQUE_CONSTRAINT", org.jooq.impl.SQLDataType.BIGINT, KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.POSITION_IN_UNIQUE_CONSTRAINT</code>.
+     */
+    public static final TableField<Record, byte[]> POSITION_IN_UNIQUE_CONSTRAINT = createField("POSITION_IN_UNIQUE_CONSTRAINT", org.jooq.impl.SQLDataType.BINARY, KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REFERENCED_TABLE_SCHEMA = createField("REFERENCED_TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, byte[]> REFERENCED_TABLE_SCHEMA = createField("REFERENCED_TABLE_SCHEMA", org.jooq.impl.SQLDataType.BINARY, KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REFERENCED_TABLE_NAME = createField("REFERENCED_TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME</code>.
+     */
+    public static final TableField<Record, byte[]> REFERENCED_TABLE_NAME = createField("REFERENCED_TABLE_NAME", org.jooq.impl.SQLDataType.BINARY, KEY_COLUMN_USAGE, "");
 
-	/**
-	 * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REFERENCED_COLUMN_NAME = createField("REFERENCED_COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), KEY_COLUMN_USAGE, "");
+    /**
+     * The column <code>information_schema.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME</code>.
+     */
+    public static final TableField<Record, byte[]> REFERENCED_COLUMN_NAME = createField("REFERENCED_COLUMN_NAME", org.jooq.impl.SQLDataType.BINARY, KEY_COLUMN_USAGE, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage() {
-		this("KEY_COLUMN_USAGE", null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private KeyColumnUsage() {
+        this(DSL.name("KEY_COLUMN_USAGE"), null);
+    }
 
-	private KeyColumnUsage(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    private KeyColumnUsage(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
 
-	private KeyColumnUsage(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private KeyColumnUsage(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Parameters.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Parameters.java
index 1bd2b75144..f3afece1cb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Parameters.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Parameters.java
@@ -1,118 +1,152 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.UInteger;
+import org.jooq.types.ULong;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Parameters extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1665633877;
+    private static final long serialVersionUID = -1788914334;
 
-	/**
-	 * The singleton instance of <code>information_schema.PARAMETERS</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Parameters PARAMETERS = new org.jooq.util.mysql.information_schema.tables.Parameters();
+    /**
+     * The reference instance of <code>information_schema.PARAMETERS</code>
+     */
+    public static final Parameters PARAMETERS = new Parameters();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.SPECIFIC_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SPECIFIC_CATALOG = createField("SPECIFIC_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.SPECIFIC_CATALOG</code>.
+     */
+    public static final TableField<Record, String> SPECIFIC_CATALOG = createField("SPECIFIC_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.SPECIFIC_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SPECIFIC_SCHEMA = createField("SPECIFIC_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.SPECIFIC_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> SPECIFIC_SCHEMA = createField("SPECIFIC_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.SPECIFIC_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SPECIFIC_NAME = createField("SPECIFIC_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.SPECIFIC_NAME</code>.
+     */
+    public static final TableField<Record, String> SPECIFIC_NAME = createField("SPECIFIC_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.ORDINAL_POSITION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.ORDINAL_POSITION</code>.
+     */
+    public static final TableField<Record, ULong> ORDINAL_POSITION = createField("ORDINAL_POSITION", org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false).defaultValue(org.jooq.impl.DSL.inline("0", org.jooq.impl.SQLDataType.BIGINTUNSIGNED)), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.PARAMETER_MODE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> PARAMETER_MODE = createField("PARAMETER_MODE", org.jooq.impl.SQLDataType.VARCHAR.length(5), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.PARAMETER_MODE</code>.
+     */
+    public static final TableField<Record, String> PARAMETER_MODE = createField("PARAMETER_MODE", org.jooq.impl.SQLDataType.VARCHAR(5), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.PARAMETER_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> PARAMETER_NAME = createField("PARAMETER_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.PARAMETER_NAME</code>.
+     */
+    public static final TableField<Record, String> PARAMETER_NAME = createField("PARAMETER_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.DATA_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DATA_TYPE = createField("DATA_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.DATA_TYPE</code>.
+     */
+    public static final TableField<Record, String> DATA_TYPE = createField("DATA_TYPE", org.jooq.impl.SQLDataType.CLOB, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.CHARACTER_MAXIMUM_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> CHARACTER_MAXIMUM_LENGTH = createField("CHARACTER_MAXIMUM_LENGTH", org.jooq.impl.SQLDataType.INTEGER, PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.CHARACTER_MAXIMUM_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_MAXIMUM_LENGTH = createField("CHARACTER_MAXIMUM_LENGTH", org.jooq.impl.SQLDataType.BIGINT, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.CHARACTER_OCTET_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> CHARACTER_OCTET_LENGTH = createField("CHARACTER_OCTET_LENGTH", org.jooq.impl.SQLDataType.INTEGER, PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.CHARACTER_OCTET_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_OCTET_LENGTH = createField("CHARACTER_OCTET_LENGTH", org.jooq.impl.SQLDataType.BIGINT, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.NUMERIC_PRECISION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> NUMERIC_PRECISION = createField("NUMERIC_PRECISION", org.jooq.impl.SQLDataType.INTEGER, PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.NUMERIC_PRECISION</code>.
+     */
+    public static final TableField<Record, UInteger> NUMERIC_PRECISION = createField("NUMERIC_PRECISION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.NUMERIC_SCALE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> NUMERIC_SCALE = createField("NUMERIC_SCALE", org.jooq.impl.SQLDataType.INTEGER, PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.NUMERIC_SCALE</code>.
+     */
+    public static final TableField<Record, Long> NUMERIC_SCALE = createField("NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.CHARACTER_SET_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CHARACTER_SET_NAME = createField("CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.DATETIME_PRECISION</code>.
+     */
+    public static final TableField<Record, UInteger> DATETIME_PRECISION = createField("DATETIME_PRECISION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.COLLATION_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLLATION_NAME = createField("COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.CHARACTER_SET_NAME</code>.
+     */
+    public static final TableField<Record, String> CHARACTER_SET_NAME = createField("CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.DTD_IDENTIFIER</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DTD_IDENTIFIER = createField("DTD_IDENTIFIER", org.jooq.impl.SQLDataType.CLOB.nullable(false), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.COLLATION_NAME</code>.
+     */
+    public static final TableField<Record, String> COLLATION_NAME = createField("COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), PARAMETERS, "");
 
-	/**
-	 * The column <code>information_schema.PARAMETERS.ROUTINE_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> ROUTINE_TYPE = createField("ROUTINE_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(9).nullable(false).defaulted(true), PARAMETERS, "");
+    /**
+     * The column <code>information_schema.PARAMETERS.DTD_IDENTIFIER</code>.
+     */
+    public static final TableField<Record, String> DTD_IDENTIFIER = createField("DTD_IDENTIFIER", org.jooq.impl.SQLDataType.CLOB.nullable(false), PARAMETERS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters() {
-		this("PARAMETERS", null);
-	}
+    /**
+     * The column <code>information_schema.PARAMETERS.ROUTINE_TYPE</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_TYPE = createField("ROUTINE_TYPE", org.jooq.impl.SQLDataType.VARCHAR(9).nullable(false), PARAMETERS, "");
 
-	private Parameters(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Parameters() {
+        this(DSL.name("PARAMETERS"), null);
+    }
 
-	private Parameters(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private Parameters(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Parameters(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
index 6509fe4033..2cef35194c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
@@ -1,98 +1,125 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ReferentialConstraints extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1234359031;
+    private static final long serialVersionUID = 107089781;
 
-	/**
-	 * The singleton instance of <code>information_schema.REFERENTIAL_CONSTRAINTS</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.ReferentialConstraints REFERENTIAL_CONSTRAINTS = new org.jooq.util.mysql.information_schema.tables.ReferentialConstraints();
+    /**
+     * The reference instance of <code>information_schema.REFERENTIAL_CONSTRAINTS</code>
+     */
+    public static final ReferentialConstraints REFERENTIAL_CONSTRAINTS = new ReferentialConstraints();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_CATALOG</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(170).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> UNIQUE_CONSTRAINT_CATALOG = createField("UNIQUE_CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_CATALOG</code>.
+     */
+    public static final TableField<Record, String> UNIQUE_CONSTRAINT_CATALOG = createField("UNIQUE_CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(170).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> UNIQUE_CONSTRAINT_SCHEMA = createField("UNIQUE_CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> UNIQUE_CONSTRAINT_SCHEMA = createField("UNIQUE_CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> UNIQUE_CONSTRAINT_NAME = createField("UNIQUE_CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME</code>.
+     */
+    public static final TableField<Record, String> UNIQUE_CONSTRAINT_NAME = createField("UNIQUE_CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR(21).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.MATCH_OPTION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> MATCH_OPTION = createField("MATCH_OPTION", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.MATCH_OPTION</code>.
+     */
+    public static final TableField<Record, String> MATCH_OPTION = createField("MATCH_OPTION", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UPDATE_RULE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> UPDATE_RULE = createField("UPDATE_RULE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.UPDATE_RULE</code>.
+     */
+    public static final TableField<Record, String> UPDATE_RULE = createField("UPDATE_RULE", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.DELETE_RULE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DELETE_RULE = createField("DELETE_RULE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.DELETE_RULE</code>.
+     */
+    public static final TableField<Record, String> DELETE_RULE = createField("DELETE_RULE", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.REFERENCED_TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REFERENCED_TABLE_NAME = createField("REFERENCED_TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), REFERENTIAL_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.REFERENTIAL_CONSTRAINTS.REFERENCED_TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> REFERENCED_TABLE_NAME = createField("REFERENCED_TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(21).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), REFERENTIAL_CONSTRAINTS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints() {
-		this("REFERENTIAL_CONSTRAINTS", null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private ReferentialConstraints() {
+        this(DSL.name("REFERENTIAL_CONSTRAINTS"), null);
+    }
 
-	private ReferentialConstraints(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    private ReferentialConstraints(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
 
-	private ReferentialConstraints(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private ReferentialConstraints(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Routines.java
new file mode 100644
index 0000000000..a2f58a0d22
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Routines.java
@@ -0,0 +1,228 @@
+/*
+ * This file is generated by jOOQ.
+*/
+package org.jooq.util.mysql.information_schema.tables;
+
+
+import java.sql.Timestamp;
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.UInteger;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Routines extends TableImpl<Record> {
+
+    private static final long serialVersionUID = -41886606;
+
+    /**
+     * The reference instance of <code>information_schema.ROUTINES</code>
+     */
+    public static final Routines ROUTINES = new Routines();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
+
+    /**
+     * The column <code>information_schema.ROUTINES.SPECIFIC_NAME</code>.
+     */
+    public static final TableField<Record, String> SPECIFIC_NAME = createField("SPECIFIC_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_CATALOG</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_CATALOG = createField("ROUTINE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_SCHEMA = createField("ROUTINE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_NAME</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_NAME = createField("ROUTINE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_TYPE</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_TYPE = createField("ROUTINE_TYPE", org.jooq.impl.SQLDataType.VARCHAR(9).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.DATA_TYPE</code>.
+     */
+    public static final TableField<Record, String> DATA_TYPE = createField("DATA_TYPE", org.jooq.impl.SQLDataType.CLOB, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.CHARACTER_MAXIMUM_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_MAXIMUM_LENGTH = createField("CHARACTER_MAXIMUM_LENGTH", org.jooq.impl.SQLDataType.BIGINT, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.CHARACTER_OCTET_LENGTH</code>.
+     */
+    public static final TableField<Record, Long> CHARACTER_OCTET_LENGTH = createField("CHARACTER_OCTET_LENGTH", org.jooq.impl.SQLDataType.BIGINT, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.NUMERIC_PRECISION</code>.
+     */
+    public static final TableField<Record, UInteger> NUMERIC_PRECISION = createField("NUMERIC_PRECISION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.NUMERIC_SCALE</code>.
+     */
+    public static final TableField<Record, UInteger> NUMERIC_SCALE = createField("NUMERIC_SCALE", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.DATETIME_PRECISION</code>.
+     */
+    public static final TableField<Record, UInteger> DATETIME_PRECISION = createField("DATETIME_PRECISION", org.jooq.impl.SQLDataType.INTEGERUNSIGNED, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.CHARACTER_SET_NAME</code>.
+     */
+    public static final TableField<Record, String> CHARACTER_SET_NAME = createField("CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.COLLATION_NAME</code>.
+     */
+    public static final TableField<Record, String> COLLATION_NAME = createField("COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.DTD_IDENTIFIER</code>.
+     */
+    public static final TableField<Record, String> DTD_IDENTIFIER = createField("DTD_IDENTIFIER", org.jooq.impl.SQLDataType.CLOB, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_BODY</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_BODY = createField("ROUTINE_BODY", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_DEFINITION</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_DEFINITION = createField("ROUTINE_DEFINITION", org.jooq.impl.SQLDataType.CLOB, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.EXTERNAL_NAME</code>.
+     */
+    public static final TableField<Record, byte[]> EXTERNAL_NAME = createField("EXTERNAL_NAME", org.jooq.impl.SQLDataType.BINARY, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.EXTERNAL_LANGUAGE</code>.
+     */
+    public static final TableField<Record, byte[]> EXTERNAL_LANGUAGE = createField("EXTERNAL_LANGUAGE", org.jooq.impl.SQLDataType.BINARY, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.PARAMETER_STYLE</code>.
+     */
+    public static final TableField<Record, String> PARAMETER_STYLE = createField("PARAMETER_STYLE", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.IS_DETERMINISTIC</code>.
+     */
+    public static final TableField<Record, String> IS_DETERMINISTIC = createField("IS_DETERMINISTIC", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.SQL_DATA_ACCESS</code>.
+     */
+    public static final TableField<Record, String> SQL_DATA_ACCESS = createField("SQL_DATA_ACCESS", org.jooq.impl.SQLDataType.VARCHAR(17).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.SQL_PATH</code>.
+     */
+    public static final TableField<Record, byte[]> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.BINARY, ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.SECURITY_TYPE</code>.
+     */
+    public static final TableField<Record, String> SECURITY_TYPE = createField("SECURITY_TYPE", org.jooq.impl.SQLDataType.VARCHAR(7).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.CREATED</code>.
+     */
+    public static final TableField<Record, Timestamp> CREATED = createField("CREATED", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("CURRENT_TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP)), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.LAST_ALTERED</code>.
+     */
+    public static final TableField<Record, Timestamp> LAST_ALTERED = createField("LAST_ALTERED", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("CURRENT_TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP)), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.SQL_MODE</code>.
+     */
+    public static final TableField<Record, String> SQL_MODE = createField("SQL_MODE", org.jooq.impl.SQLDataType.VARCHAR(503).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.ROUTINE_COMMENT</code>.
+     */
+    public static final TableField<Record, String> ROUTINE_COMMENT = createField("ROUTINE_COMMENT", org.jooq.impl.SQLDataType.CLOB.nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.DEFINER</code>.
+     */
+    public static final TableField<Record, String> DEFINER = createField("DEFINER", org.jooq.impl.SQLDataType.VARCHAR(93).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.CHARACTER_SET_CLIENT</code>.
+     */
+    public static final TableField<Record, String> CHARACTER_SET_CLIENT = createField("CHARACTER_SET_CLIENT", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.COLLATION_CONNECTION</code>.
+     */
+    public static final TableField<Record, String> COLLATION_CONNECTION = createField("COLLATION_CONNECTION", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * The column <code>information_schema.ROUTINES.DATABASE_COLLATION</code>.
+     */
+    public static final TableField<Record, String> DATABASE_COLLATION = createField("DATABASE_COLLATION", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), ROUTINES, "");
+
+    /**
+     * No further instances allowed
+     */
+    private Routines() {
+        this(DSL.name("ROUTINES"), null);
+    }
+
+    private Routines(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Routines(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java
index 2a00f18863..6fe2b30394 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java
@@ -1,68 +1,95 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Schemata extends TableImpl<Record> {
 
-	private static final long serialVersionUID = -2145867409;
+    private static final long serialVersionUID = 1272803027;
 
-	/**
-	 * The singleton instance of <code>information_schema.SCHEMATA</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.mysql.information_schema.tables.Schemata();
+    /**
+     * The reference instance of <code>information_schema.SCHEMATA</code>
+     */
+    public static final Schemata SCHEMATA = new Schemata();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.SCHEMATA.CATALOG_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), SCHEMATA, "");
+    /**
+     * The column <code>information_schema.SCHEMATA.CATALOG_NAME</code>.
+     */
+    public static final TableField<Record, String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), SCHEMATA, "");
 
-	/**
-	 * The column <code>information_schema.SCHEMATA.SCHEMA_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), SCHEMATA, "");
+    /**
+     * The column <code>information_schema.SCHEMATA.SCHEMA_NAME</code>.
+     */
+    public static final TableField<Record, String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), SCHEMATA, "");
 
-	/**
-	 * The column <code>information_schema.SCHEMATA.DEFAULT_CHARACTER_SET_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(32).nullable(false).defaulted(true), SCHEMATA, "");
+    /**
+     * The column <code>information_schema.SCHEMATA.DEFAULT_CHARACTER_SET_NAME</code>.
+     */
+    public static final TableField<Record, String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), SCHEMATA, "");
 
-	/**
-	 * The column <code>information_schema.SCHEMATA.DEFAULT_COLLATION_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_COLLATION_NAME = createField("DEFAULT_COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(32).nullable(false).defaulted(true), SCHEMATA, "");
+    /**
+     * The column <code>information_schema.SCHEMATA.DEFAULT_COLLATION_NAME</code>.
+     */
+    public static final TableField<Record, String> DEFAULT_COLLATION_NAME = createField("DEFAULT_COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), SCHEMATA, "");
 
-	/**
-	 * The column <code>information_schema.SCHEMATA.SQL_PATH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.VARCHAR.length(512), SCHEMATA, "");
+    /**
+     * The column <code>information_schema.SCHEMATA.SQL_PATH</code>.
+     */
+    public static final TableField<Record, byte[]> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.BINARY, SCHEMATA, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Schemata() {
-		this("SCHEMATA", null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Schemata() {
+        this(DSL.name("SCHEMATA"), null);
+    }
 
-	private Schemata(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    private Schemata(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
 
-	private Schemata(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private Schemata(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Statistics.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Statistics.java
index 2919629e2b..ee5ab81c91 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Statistics.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Statistics.java
@@ -1,123 +1,157 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.UInteger;
+import org.jooq.types.ULong;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Statistics extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Statistics extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 357430055;
+    private static final long serialVersionUID = -2655452;
 
-	/**
-	 * The singleton instance of <code>information_schema.STATISTICS</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Statistics STATISTICS = new org.jooq.util.mysql.information_schema.tables.Statistics();
+    /**
+     * The reference instance of <code>information_schema.STATISTICS</code>
+     */
+    public static final Statistics STATISTICS = new Statistics();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.STATISTICS.TABLE_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.TABLE_CATALOG</code>.
+     */
+    public static final TableField<Record, String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.NON_UNIQUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> NON_UNIQUE = createField("NON_UNIQUE", org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.NON_UNIQUE</code>.
+     */
+    public static final TableField<Record, String> NON_UNIQUE = createField("NON_UNIQUE", org.jooq.impl.SQLDataType.VARCHAR(1).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.INDEX_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> INDEX_SCHEMA = createField("INDEX_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.INDEX_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> INDEX_SCHEMA = createField("INDEX_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.INDEX_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> INDEX_NAME = createField("INDEX_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.INDEX_NAME</code>.
+     */
+    public static final TableField<Record, String> INDEX_NAME = createField("INDEX_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.SEQ_IN_INDEX</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> SEQ_IN_INDEX = createField("SEQ_IN_INDEX", org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.SEQ_IN_INDEX</code>.
+     */
+    public static final TableField<Record, UInteger> SEQ_IN_INDEX = createField("SEQ_IN_INDEX", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.COLUMN_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.COLUMN_NAME</code>.
+     */
+    public static final TableField<Record, String> COLUMN_NAME = createField("COLUMN_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.COLLATION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLLATION = createField("COLLATION", org.jooq.impl.SQLDataType.VARCHAR.length(1), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.COLLATION</code>.
+     */
+    public static final TableField<Record, String> COLLATION = createField("COLLATION", org.jooq.impl.SQLDataType.VARCHAR(1), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.CARDINALITY</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> CARDINALITY = createField("CARDINALITY", org.jooq.impl.SQLDataType.BIGINT, STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.CARDINALITY</code>.
+     */
+    public static final TableField<Record, ULong> CARDINALITY = createField("CARDINALITY", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.SUB_PART</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> SUB_PART = createField("SUB_PART", org.jooq.impl.SQLDataType.BIGINT, STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.SUB_PART</code>.
+     */
+    public static final TableField<Record, Long> SUB_PART = createField("SUB_PART", org.jooq.impl.SQLDataType.BIGINT, STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.PACKED</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> PACKED = createField("PACKED", org.jooq.impl.SQLDataType.VARCHAR.length(10), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.PACKED</code>.
+     */
+    public static final TableField<Record, byte[]> PACKED = createField("PACKED", org.jooq.impl.SQLDataType.BINARY, STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.NULLABLE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> NULLABLE = createField("NULLABLE", org.jooq.impl.SQLDataType.VARCHAR.length(3).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.NULLABLE</code>.
+     */
+    public static final TableField<Record, String> NULLABLE = createField("NULLABLE", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.INDEX_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> INDEX_TYPE = createField("INDEX_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(16).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.INDEX_TYPE</code>.
+     */
+    public static final TableField<Record, String> INDEX_TYPE = createField("INDEX_TYPE", org.jooq.impl.SQLDataType.VARCHAR(11).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.COMMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMENT = createField("COMMENT", org.jooq.impl.SQLDataType.VARCHAR.length(16), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.COMMENT</code>.
+     */
+    public static final TableField<Record, String> COMMENT = createField("COMMENT", org.jooq.impl.SQLDataType.VARCHAR(8).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), STATISTICS, "");
 
-	/**
-	 * The column <code>information_schema.STATISTICS.INDEX_COMMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> INDEX_COMMENT = createField("INDEX_COMMENT", org.jooq.impl.SQLDataType.VARCHAR.length(1024).nullable(false).defaulted(true), STATISTICS, "");
+    /**
+     * The column <code>information_schema.STATISTICS.INDEX_COMMENT</code>.
+     */
+    public static final TableField<Record, String> INDEX_COMMENT = createField("INDEX_COMMENT", org.jooq.impl.SQLDataType.VARCHAR(2048).nullable(false), STATISTICS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Statistics() {
-		this("STATISTICS", null);
-	}
+    /**
+     * The column <code>information_schema.STATISTICS.IS_VISIBLE</code>.
+     */
+    public static final TableField<Record, String> IS_VISIBLE = createField("IS_VISIBLE", org.jooq.impl.SQLDataType.VARCHAR(3).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), STATISTICS, "");
 
-	private Statistics(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Statistics() {
+        this(DSL.name("STATISTICS"), null);
+    }
 
-	private Statistics(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private Statistics(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Statistics(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
index cbb8543252..1877ec2b69 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
@@ -1,73 +1,100 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class TableConstraints extends TableImpl<Record> {
 
-	private static final long serialVersionUID = -1909788577;
+    private static final long serialVersionUID = -794026735;
 
-	/**
-	 * The singleton instance of <code>information_schema.TABLE_CONSTRAINTS</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.TableConstraints TABLE_CONSTRAINTS = new org.jooq.util.mysql.information_schema.tables.TableConstraints();
+    /**
+     * The reference instance of <code>information_schema.TABLE_CONSTRAINTS</code>
+     */
+    public static final TableConstraints TABLE_CONSTRAINTS = new TableConstraints();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_CATALOG</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_CATALOG = createField("CONSTRAINT_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_SCHEMA = createField("CONSTRAINT_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_NAME</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR(64), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_TYPE = createField("CONSTRAINT_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLE_CONSTRAINTS, "");
+    /**
+     * The column <code>information_schema.TABLE_CONSTRAINTS.CONSTRAINT_TYPE</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINT_TYPE = createField("CONSTRAINT_TYPE", org.jooq.impl.SQLDataType.VARCHAR(11).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), TABLE_CONSTRAINTS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints() {
-		this("TABLE_CONSTRAINTS", null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private TableConstraints() {
+        this(DSL.name("TABLE_CONSTRAINTS"), null);
+    }
 
-	private TableConstraints(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    private TableConstraints(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
 
-	private TableConstraints(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private TableConstraints(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
index f04b93e78c..40a326054e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
@@ -1,148 +1,178 @@
-/**
- * This class is generated by jOOQ
- */
+/*
+ * This file is generated by jOOQ.
+*/
 package org.jooq.util.mysql.information_schema.tables;
 
+
+import java.sql.Timestamp;
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.ULong;
+import org.jooq.util.mysql.information_schema.InformationSchema;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.5.0" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.10.0"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Tables extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1728740650;
+    private static final long serialVersionUID = 1915460822;
 
-	/**
-	 * The singleton instance of <code>information_schema.TABLES</code>
-	 */
-	public static final org.jooq.util.mysql.information_schema.tables.Tables TABLES = new org.jooq.util.mysql.information_schema.tables.Tables();
+    /**
+     * The reference instance of <code>information_schema.TABLES</code>
+     */
+    public static final Tables TABLES = new Tables();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_CATALOG</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR.length(512).nullable(false).defaulted(true), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_CATALOG</code>.
+     */
+    public static final TableField<Record, String> TABLE_CATALOG = createField("TABLE_CATALOG", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_SCHEMA</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_SCHEMA</code>.
+     */
+    public static final TableField<Record, String> TABLE_SCHEMA = createField("TABLE_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_NAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_NAME</code>.
+     */
+    public static final TableField<Record, String> TABLE_NAME = createField("TABLE_NAME", org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_TYPE = createField("TABLE_TYPE", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_TYPE</code>.
+     */
+    public static final TableField<Record, String> TABLE_TYPE = createField("TABLE_TYPE", org.jooq.impl.SQLDataType.VARCHAR(11).nullable(false), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.ENGINE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> ENGINE = createField("ENGINE", org.jooq.impl.SQLDataType.VARCHAR.length(64), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.ENGINE</code>.
+     */
+    public static final TableField<Record, String> ENGINE = createField("ENGINE", org.jooq.impl.SQLDataType.VARCHAR(64), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.VERSION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> VERSION = createField("VERSION", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.VERSION</code>.
+     */
+    public static final TableField<Record, Integer> VERSION = createField("VERSION", org.jooq.impl.SQLDataType.INTEGER, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.ROW_FORMAT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> ROW_FORMAT = createField("ROW_FORMAT", org.jooq.impl.SQLDataType.VARCHAR.length(10), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.ROW_FORMAT</code>.
+     */
+    public static final TableField<Record, String> ROW_FORMAT = createField("ROW_FORMAT", org.jooq.impl.SQLDataType.VARCHAR(10), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_ROWS</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> TABLE_ROWS = createField("TABLE_ROWS", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_ROWS</code>.
+     */
+    public static final TableField<Record, ULong> TABLE_ROWS = createField("TABLE_ROWS", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.AVG_ROW_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> AVG_ROW_LENGTH = createField("AVG_ROW_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.AVG_ROW_LENGTH</code>.
+     */
+    public static final TableField<Record, ULong> AVG_ROW_LENGTH = createField("AVG_ROW_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.DATA_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> DATA_LENGTH = createField("DATA_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.DATA_LENGTH</code>.
+     */
+    public static final TableField<Record, ULong> DATA_LENGTH = createField("DATA_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.MAX_DATA_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> MAX_DATA_LENGTH = createField("MAX_DATA_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.MAX_DATA_LENGTH</code>.
+     */
+    public static final TableField<Record, ULong> MAX_DATA_LENGTH = createField("MAX_DATA_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.INDEX_LENGTH</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> INDEX_LENGTH = createField("INDEX_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.INDEX_LENGTH</code>.
+     */
+    public static final TableField<Record, ULong> INDEX_LENGTH = createField("INDEX_LENGTH", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.DATA_FREE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> DATA_FREE = createField("DATA_FREE", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.DATA_FREE</code>.
+     */
+    public static final TableField<Record, ULong> DATA_FREE = createField("DATA_FREE", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.AUTO_INCREMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> AUTO_INCREMENT = createField("AUTO_INCREMENT", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.AUTO_INCREMENT</code>.
+     */
+    public static final TableField<Record, ULong> AUTO_INCREMENT = createField("AUTO_INCREMENT", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.CREATE_TIME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> CREATE_TIME = createField("CREATE_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.CREATE_TIME</code>.
+     */
+    public static final TableField<Record, Timestamp> CREATE_TIME = createField("CREATE_TIME", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("CURRENT_TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP)), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.UPDATE_TIME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> UPDATE_TIME = createField("UPDATE_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.UPDATE_TIME</code>.
+     */
+    public static final TableField<Record, Timestamp> UPDATE_TIME = createField("UPDATE_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.CHECK_TIME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> CHECK_TIME = createField("CHECK_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.CHECK_TIME</code>.
+     */
+    public static final TableField<Record, Timestamp> CHECK_TIME = createField("CHECK_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_COLLATION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_COLLATION = createField("TABLE_COLLATION", org.jooq.impl.SQLDataType.VARCHAR.length(32), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_COLLATION</code>.
+     */
+    public static final TableField<Record, String> TABLE_COLLATION = createField("TABLE_COLLATION", org.jooq.impl.SQLDataType.VARCHAR(64), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.CHECKSUM</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, org.jooq.types.ULong> CHECKSUM = createField("CHECKSUM", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.CHECKSUM</code>.
+     */
+    public static final TableField<Record, ULong> CHECKSUM = createField("CHECKSUM", org.jooq.impl.SQLDataType.BIGINTUNSIGNED, TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.CREATE_OPTIONS</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CREATE_OPTIONS = createField("CREATE_OPTIONS", org.jooq.impl.SQLDataType.VARCHAR.length(255), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.CREATE_OPTIONS</code>.
+     */
+    public static final TableField<Record, String> CREATE_OPTIONS = createField("CREATE_OPTIONS", org.jooq.impl.SQLDataType.VARCHAR(256), TABLES, "");
 
-	/**
-	 * The column <code>information_schema.TABLES.TABLE_COMMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_COMMENT = createField("TABLE_COMMENT", org.jooq.impl.SQLDataType.VARCHAR.length(2048).nullable(false).defaulted(true), TABLES, "");
+    /**
+     * The column <code>information_schema.TABLES.TABLE_COMMENT</code>.
+     */
+    public static final TableField<Record, String> TABLE_COMMENT = createField("TABLE_COMMENT", org.jooq.impl.SQLDataType.VARCHAR(256), TABLES, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables() {
-		this("TABLES", null);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Tables() {
+        this(DSL.name("TABLES"), null);
+    }
 
-	private Tables(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased) {
-		this(alias, aliased, null);
-	}
+    private Tables(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
 
-	private Tables(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA, aliased, parameters, "");
-	}
+    private Tables(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return InformationSchema.INFORMATION_SCHEMA;
+    }
 }