diff --git a/dbcon/mysql/ha_mcs_ddl.cpp b/dbcon/mysql/ha_mcs_ddl.cpp
index f81112532..2a4c9057b 100644
--- a/dbcon/mysql/ha_mcs_ddl.cpp
+++ b/dbcon/mysql/ha_mcs_ddl.cpp
@@ -2395,6 +2395,18 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
                 oss << ", ";
             oss << (*field)->field_name.str << " " << datatype.ptr();
 
+
+            if ((*field)->has_charset())
+            {
+                const CHARSET_INFO* field_cs = (*field)->charset();
+                if (field_cs &&
+                    (!share->table_charset ||
+                     field_cs->number != share->table_charset->number))
+                {
+                    oss << " CHARACTER SET " << field_cs->csname;
+                }
+            }
+
             if (flags & NOT_NULL_FLAG)
                 oss << " NOT NULL";
 
@@ -2404,12 +2416,6 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
                 oss << " DEFAULT " << def_value.c_ptr();
             }
 
-            const CHARSET_INFO* field_cs = (*field)->charset();
-            if (field_cs && (!share->table_charset || field_cs->number != share->table_charset->number))
-            {
-                oss << " CHARACTER SET " << field_cs->csname;
-            }
-
             if ((*field)->comment.length)
             {
                 String comment;