WL#15652: Deprecate mysqlpump

Added a deprecation warning Adjusted the tests to account for it. Change-Id: I117888a56cd20e7550199f0b0b139c1648fdc436
mysql · Apr 5, 2023 · dd81a0e · dd81a0e
1 parent 84ef6fe
commit dd81a0e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git a/client/dump/program.cc b/client/dump/program.cc
@@ -271,6 +271,7 @@ const char *load_default_groups[] = {
     "mysqlpump", nullptr};
 
 int main(int argc, char **argv) {
+  CLIENT_WARN_DEPRECATED("mysqlpump", "mysqldump");
   Program program;
   program.run(argc, argv);
   return 0;

diff --git a/mysql-test/r/mysqlpump.result b/mysql-test/r/mysqlpump.result
@@ -461,6 +461,7 @@ DROP DATABASE db1;
 DROP DATABASE db2;
 DROP DATABASE db3;
 DROP DATABASE db1_1gb;
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 SHOW VARIABLES LIKE "master_info_repository";
 Variable_name	Value
 master_info_repository	TABLE

diff --git a/mysql-test/r/mysqlpump_bugs.result b/mysql-test/r/mysqlpump_bugs.result
@@ -2,10 +2,12 @@
 # Bug#23102944: MYSQLPUMP LEAKS MEMORY IN CASE OF ERRORS.
 #
 # testing a failed connection: must not crash
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 mysqlpump: Got error: 2005: Unknown MySQL server host 'non_existent_ghost' (errno) while connecting to the MySQL server
 mysqlpump: [ERROR] (11) 
 Dump process encountered error and will not continue.
 # testing an invalid option: must not crash
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 mysqlpump: [ERROR] unknown variable 'parallelism=3'.
 mysqlpump: [ERROR] (7) Error during handling options
 Dump process encountered error and will not continue.

diff --git a/mysql-test/r/ssl_cache.result b/mysql-test/r/ssl_cache.result
@@ -68,6 +68,7 @@ ERROR: --ssl-session-data specified but the session was not reused.
 # try mysqltest
 mysqltest: --ssl-session-data specified but the session was not reused.
 # try mysqlpump
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 --ssl-session-data specified but the session was not reused.
 # FR12.1: make sure --ssl-session-data-continue-on-failed-reuse works
 # try mysql

diff --git a/mysql-test/r/ssl_cache_openssl1_0.result b/mysql-test/r/ssl_cache_openssl1_0.result
@@ -66,6 +66,7 @@ ERROR: --ssl-session-data specified but the session was not reused.
 # try mysqltest
 mysqltest: --ssl-session-data specified but the session was not reused.
 # try mysqlpump
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 --ssl-session-data specified but the session was not reused.
 # FR12.1: make sure --ssl-session-data-continue-on-failed-reuse works
 # try mysql

diff --git a/mysql-test/r/ssl_cache_tls13.result b/mysql-test/r/ssl_cache_tls13.result
@@ -68,6 +68,7 @@ ERROR: --ssl-session-data specified but the session was not reused.
 # try mysqltest
 mysqltest: --ssl-session-data specified but the session was not reused.
 # try mysqlpump
+WARNING: mysqlpump is deprecated and will be removed in a future version. Use mysqldump instead.
 --ssl-session-data specified but the session was not reused.
 # FR12.1: make sure --ssl-session-data-continue-on-failed-reuse works
 # try mysql