MDEV-32216 Compile mysqldump as C++ (preparation for using connection…

… pool)
MariaDB · Jan 29, 2024 · a553d55 · a553d55
1 parent d039346
commit a553d55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(mariadb-test PROPERTIES ENABLE_EXPORTS TRUE)
 MYSQL_ADD_EXECUTABLE(mariadb-check mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mariadb-check ${CLIENT_LIB})
 
-MYSQL_ADD_EXECUTABLE(mariadb-dump mysqldump.c ../sql-common/my_user.c)
+MYSQL_ADD_EXECUTABLE(mariadb-dump mysqldump.cc ../sql-common/my_user.c)
 TARGET_LINK_LIBRARIES(mariadb-dump ${CLIENT_LIB})
 
 MYSQL_ADD_EXECUTABLE(mariadb-import mysqlimport.c)

diff --git a/client/mysqldump.c → client/mysqldump.cc b/client/mysqldump.c → client/mysqldump.cc
@@ -6761,7 +6761,7 @@ static char *primary_key_fields(const char *table_name)
  {
  char *end;
  /* result (terminating \0 is already in result_length) */
- result= my_malloc(PSI_NOT_INSTRUMENTED, result_length + 10, MYF(MY_WME));
+ result= (char *)my_malloc(PSI_NOT_INSTRUMENTED, result_length + 10, MYF(MY_WME));
  if (!result)
  {
  fprintf(stderr, "Error: Not enough memory to store ORDER BY clause\n");