diff --git a/include/mysql_com.h b/include/mysql_com.h
index 36d6ad526f8..eb28d8b5092 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -213,43 +213,43 @@ enum enum_indicator_type
 #define REFRESH_FAST            (1ULL << 31) /* Intern flag */
 
 #define CLIENT_LONG_PASSWORD	0	/* obsolete flag */
-#define CLIENT_MYSQL            1       /* mysql/old mariadb server/client */
-#define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
-#define CLIENT_LONG_FLAG	4	/* Get all column flags */
-#define CLIENT_CONNECT_WITH_DB	8	/* One can specify db on connect */
-#define CLIENT_NO_SCHEMA	16	/* Don't allow database.table.column */
-#define CLIENT_COMPRESS		32	/* Can use compression protocol */
-#define CLIENT_ODBC		64	/* Odbc client */
-#define CLIENT_LOCAL_FILES	128	/* Can use LOAD DATA LOCAL */
-#define CLIENT_IGNORE_SPACE	256	/* Ignore spaces before '(' */
-#define CLIENT_PROTOCOL_41	512	/* New 4.1 protocol */
-#define CLIENT_INTERACTIVE	1024	/* This is an interactive client */
-#define CLIENT_SSL              2048	/* Switch to SSL after handshake */
-#define CLIENT_IGNORE_SIGPIPE   4096    /* IGNORE sigpipes */
-#define CLIENT_TRANSACTIONS	8192	/* Client knows about transactions */
-#define CLIENT_RESERVED         16384   /* Old flag for 4.1 protocol  */
-#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS    (1UL << 17) /* Enable/disable multi-results */
-#define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */
+#define CLIENT_MYSQL            1ULL       /* mysql/old mariadb server/client */
+#define CLIENT_FOUND_ROWS	2ULL	/* Found instead of affected rows */
+#define CLIENT_LONG_FLAG	4ULL	/* Get all column flags */
+#define CLIENT_CONNECT_WITH_DB	8ULL	/* One can specify db on connect */
+#define CLIENT_NO_SCHEMA	16ULL	/* Don't allow database.table.column */
+#define CLIENT_COMPRESS		32ULL	/* Can use compression protocol */
+#define CLIENT_ODBC		64ULL	/* Odbc client */
+#define CLIENT_LOCAL_FILES	128ULL	/* Can use LOAD DATA LOCAL */
+#define CLIENT_IGNORE_SPACE	256ULL	/* Ignore spaces before '(' */
+#define CLIENT_PROTOCOL_41	512ULL	/* New 4.1 protocol */
+#define CLIENT_INTERACTIVE	1024ULL	/* This is an interactive client */
+#define CLIENT_SSL              2048ULL	/* Switch to SSL after handshake */
+#define CLIENT_IGNORE_SIGPIPE   4096ULL    /* IGNORE sigpipes */
+#define CLIENT_TRANSACTIONS	8192ULL	/* Client knows about transactions */
+#define CLIENT_RESERVED         16384ULL   /* Old flag for 4.1 protocol  */
+#define CLIENT_SECURE_CONNECTION 32768ULL  /* New 4.1 authentication */
+#define CLIENT_MULTI_STATEMENTS (1ULL << 16) /* Enable/disable multi-stmt support */
+#define CLIENT_MULTI_RESULTS    (1ULL << 17) /* Enable/disable multi-results */
+#define CLIENT_PS_MULTI_RESULTS (1ULL << 18) /* Multi-results in PS-protocol */
 
-#define CLIENT_PLUGIN_AUTH  (1UL << 19) /* Client supports plugin authentication */
-#define CLIENT_CONNECT_ATTRS (1UL << 20) /* Client supports connection attributes */
+#define CLIENT_PLUGIN_AUTH  (1ULL << 19) /* Client supports plugin authentication */
+#define CLIENT_CONNECT_ATTRS (1ULL << 20) /* Client supports connection attributes */
 /* Enable authentication response packet to be larger than 255 bytes. */
-#define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA (1UL << 21)
+#define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA (1ULL << 21)
 /* Don't close the connection for a connection with expired password. */
-#define CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS (1UL << 22)
+#define CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS (1ULL << 22)
 
 /**
   Capable of handling server state change information. Its a hint to the
   server to include the state change information in Ok packet.
 */
-#define CLIENT_SESSION_TRACK (1UL << 23)
+#define CLIENT_SESSION_TRACK (1ULL << 23)
 /* Client no longer needs EOF packet */
-#define CLIENT_DEPRECATE_EOF (1UL << 24)
+#define CLIENT_DEPRECATE_EOF (1ULL << 24)
 
-#define CLIENT_PROGRESS_OBSOLETE  (1UL << 29)
-#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
+#define CLIENT_PROGRESS_OBSOLETE  (1ULL << 29)
+#define CLIENT_SSL_VERIFY_SERVER_CERT (1ULL << 30)
 /*
   It used to be that if mysql_real_connect() failed, it would delete any
   options set by the client, unless the CLIENT_REMEMBER_OPTIONS flag was
@@ -259,7 +259,7 @@ enum enum_indicator_type
   always preserve any options set in case of failed connect, and this
   option is effectively always set.
 */
-#define CLIENT_REMEMBER_OPTIONS (1UL << 31)
+#define CLIENT_REMEMBER_OPTIONS (1ULL << 31)
 
 /* MariaDB extended capability flags */
 #define MARIADB_CLIENT_FLAGS_MASK 0xffffffff00000000ULL
@@ -268,7 +268,7 @@ enum enum_indicator_type
 /* support COM_MULTI */
 #define MARIADB_CLIENT_COM_MULTI (1ULL << 33)
 /* support of array binding */
-#define MARIADB_CLIENT_STMT_BULK_OPERATIONS (1UL << 34)
+#define MARIADB_CLIENT_STMT_BULK_OPERATIONS (1ULL << 34)
 
 #ifdef HAVE_COMPRESS
 #define CAN_CLIENT_COMPRESS CLIENT_COMPRESS