Bug#29948925: Change literal value for enum MYSQL_TYPE_TYPED_ARRAY

Enum MYSQL_TYPE_TYPED_ARRAY is never exposed to a client, and is generally not used in type compatibility handling. Hence it makes sense to group it with the other non-exposed fields like MYSQL_TYPE_TIME2 instead of the higher values like MYSQL_TYPE_JSON. Reviewed by: Evgeny Potemkin <evgeny.potemkin@oracle.com>
mysql · Jun 25, 2019 · 9082b6a · 9082b6a
1 parent f4c120c
commit 9082b6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/field_types.h b/include/field_types.h
@@ -72,9 +72,9 @@ enum enum_field_types
   MYSQL_TYPE_VARCHAR,
   MYSQL_TYPE_BIT,
   MYSQL_TYPE_TIMESTAMP2,
-  MYSQL_TYPE_DATETIME2,         /**< Internal to MySQL. Not used in protocol */
-  MYSQL_TYPE_TIME2,             /**< Internal to MySQL. Not used in protocol */
-  MYSQL_TYPE_TYPED_ARRAY = 244, /** Used for replication only */
+  MYSQL_TYPE_DATETIME2,   /**< Internal to MySQL. Not used in protocol */
+  MYSQL_TYPE_TIME2,       /**< Internal to MySQL. Not used in protocol */
+  MYSQL_TYPE_TYPED_ARRAY, /**< Used for replication only */
   MYSQL_TYPE_JSON = 245,
   MYSQL_TYPE_NEWDECIMAL = 246,
   MYSQL_TYPE_ENUM = 247,

diff --git a/include/mysql.h.pp b/include/mysql.h.pp
@@ -22,7 +22,7 @@
   MYSQL_TYPE_TIMESTAMP2,
   MYSQL_TYPE_DATETIME2,
   MYSQL_TYPE_TIME2,
-  MYSQL_TYPE_TYPED_ARRAY = 244,
+  MYSQL_TYPE_TYPED_ARRAY,
   MYSQL_TYPE_JSON = 245,
   MYSQL_TYPE_NEWDECIMAL = 246,
   MYSQL_TYPE_ENUM = 247,