diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-12 08:37:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-12 08:37:27 +0300 |
| commit | 2fd82471aba9447e5490b24da5da89c33a21525e (patch) | |
| tree | 562b878063c3d6224ba7090c7c01306a18561ec5 /client | |
| parent | 1f6b02e9f0059932da4a9c05fdfc26f473a89cde (diff) | |
| parent | b42dbdbccd3b939394ca9b608ad91a04235e95f1 (diff) | |
| download | mariadb-git-2fd82471aba9447e5490b24da5da89c33a21525e.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 96346808a62..37087b7c6c6 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -72,10 +72,10 @@ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) -TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) +TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB} mysys_ssl) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc ../sql/password.c) -TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB}) +TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB} mysys_ssl) MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") diff --git a/client/mysqldump.c b/client/mysqldump.c index f1746dcabc4..f1d59b449af 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -971,6 +971,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; } |