Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Ibcbb448c12a9e1120f4001ee6baf4df0297901ca

Author: harinvadodaria

include/mysql.h

@@ -458,7 +458,7 @@ const char *STDCALL mysql_character_set_name(MYSQL *mysql);
 int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
 
 MYSQL *STDCALL mysql_init(MYSQL *mysql);
-#ifdef __cplusplus
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
 [[deprecated("Use mysql_options() instead.")]]
 #endif
 bool STDCALL