v2.1.52.1

TEXT/BLOB字段和普通字段一样检测NOT NULL
hhyo · Mar 13, 2019 · 7e12da5 · 7e12da5
1 parent 44bc6e3
commit 7e12da5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
@@ -53,7 +53,7 @@ MACRO(GET_MYSQL_VERSION)
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
 
-  SET(VERSION "2.1.52.0")
+  SET(VERSION "2.1.52.1")
   MESSAGE(STATUS "MySQL ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")

diff --git a/sql/derror.cc b/sql/derror.cc
@@ -182,7 +182,7 @@ bool init_errmessage(void)
 		SERVER_SETMSG(ER_INDEX_USE_ALTER_TABLE, "请使用ALTER语句进行索引变更");
 		SERVER_SETMSG(ER_WITH_DEFAULT_ADD_COLUMN, "建议给字段 \'%-.192s\' 添加默认值");
 		SERVER_SETMSG(ER_TRUNCATED_WRONG_VALUE, "Truncated incorrect %-.32s value: \'%-.128s\'");
-		SERVER_SETMSG(ER_TEXT_NOT_NULLABLE_ERROR, "TEXT/BLOB字段 \'%-.64s\' 不允许为NOT NULL");
+		SERVER_SETMSG(ER_TEXT_NOT_NULLABLE_ERROR, "TEXT/BLOB字段 \'%-.64s\' 不允许为NULL，请指定为NOT NULL");
 		SERVER_SETMSG(ER_WRONG_VALUE_FOR_VAR, "Variable \'%-.64s\' can\'t be set to the value of \'%-.200s\'");
 		SERVER_SETMSG(ER_TOO_MUCH_AUTO_TIMESTAMP_COLS, "Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause");
 		SERVER_SETMSG(ER_INVALID_ON_UPDATE, "Invalid ON UPDATE clause for \'%-.192s\' column");