Ensure that tests and programs can restore variables

- --default-character-set can now be disabled in mysqldump
- --skip-resolve can be be disabled in mysqld
- mysql_client_test now resets global variables it changes
- mtr couldn't handle [mysqldump] in config files (wrong regexp used)

1 files changed, 4 insertions, 0 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 2195786e7ea..b9ff8caed8c 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -967,6 +967,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       exit(1);
     }
     break;
+  case (int) OPT_DEFAULT_CHARSET:
+    if (default_charset == disabled_my_option)
+      default_charset= (char *)mysql_universal_client_charset;
+    break;
   }
   return 0;
 }