diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 55fd02b23c3..7c41d78d796 100644 --- 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 b/client/mysqldump.cc similarity index 99% rename from client/mysqldump.c rename to client/mysqldump.cc index 1c6deb1b9fa..b5467759b3c 100644 --- a/client/mysqldump.c +++ b/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");