Bug#22127020 GET RID OF DYNAMIC_ARRAY IN ST_MYSQL_OPTIONS

Patch one: libmysqld.c -> libmysqld.cc, client.c -> client.cc

Author: Tor Didriksen

libmysql/CMakeLists.txt

@@ -165,7 +165,7 @@ SET(CLIENT_SOURCES
   get_password.c 
   libmysql.c
   errmsg.c
-  ../sql-common/client.c 
+  ../sql-common/client.cc
   ../sql-common/my_time.c 
   ../sql-common/client_plugin.c 
   ../sql-common/client_authentication.cc

libmysql/client_settings.h

@@ -40,6 +40,7 @@ extern char *	mysql_unix_port;
                              CLIENT_SESSION_TRACK | \
                              CLIENT_DEPRECATE_EOF)
 
+C_MODE_START
 void read_user_name(char *name);
 my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
 
@@ -62,6 +63,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt);
 int cli_unbuffered_fetch(MYSQL *mysql, char **row);
 const char * cli_read_statistics(MYSQL *mysql);
 int cli_read_change_user_result(MYSQL *mysql);
+C_MODE_END
 
 #ifdef EMBEDDED_LIBRARY
 C_MODE_START

libmysqld/CMakeLists.txt

@@ -58,13 +58,13 @@ ENDFOREACH()
 SET(SQL_EMBEDDED_SOURCES
   emb_qcache.cc
   lib_sql.cc 
-  libmysqld.c
+  libmysqld.cc
   ${GEN_SOURCES}
   ${GEN_YACC_SOURCES}
   ../client/get_password.c
   ../libmysql/errmsg.c
   ../libmysql/libmysql.c
-  ../sql-common/client.c
+  ../sql-common/client.cc
   ../sql-common/client_plugin.c
   ../sql-common/my_time.c 
   ../sql-common/my_user.c

libmysqld/lib_sql.cc

@@ -45,10 +45,12 @@
 using std::min;
 using std::max;
 
-extern "C" {
 
 extern unsigned int mysql_server_last_errno;
 extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
+
+extern "C" {
+
 static my_bool emb_read_query_result(MYSQL *mysql);
 
 

libmysqld/libmysqld.c renamed to libmysqld/libmysqld.cc

@@ -141,8 +141,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
   if (db)
     client_flag|=CLIENT_CONNECT_WITH_DB;
 
-  mysql->info_buffer= my_malloc(PSI_NOT_INSTRUMENTED,
-                                MYSQL_ERRMSG_SIZE, MYF(0));
+  mysql->info_buffer= static_cast<char*>(my_malloc(PSI_NOT_INSTRUMENTED,
+                                                   MYSQL_ERRMSG_SIZE, MYF(0)));
   mysql->thd= create_embedded_thd(client_flag);
 
   init_embedded_mysql(mysql, client_flag);