diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
| commit | bec1d903d944acd5c28c3f4f2d22b84ddae63ea2 (patch) | |
| tree | 8a903859333de1648f789a2985fd62e856ebfa05 /libmysql | |
| parent | 6ae5f0efea392e3fdb285afc1bafdae16888b96a (diff) | |
| download | mariadb-git-bec1d903d944acd5c28c3f4f2d22b84ddae63ea2.tar.gz | |
Do the partial merge of WL#5602 correctly:
Remove unused code (that should not have been merged)
Add protocol extension (that should have been merged)
Fix bugs (see pack.c)
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysql/client_settings.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index bcbb3d6cffe..43b0c6187b9 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -337,7 +337,6 @@ SET(CLIENT_SOURCES ../sql-common/mysql_async.c ../sql-common/my_time.c ../sql-common/client_plugin.c - ../sql-common/client_authentication.cc ../sql/net_serv.cc ../sql-common/pack.c ../sql/password.c diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 4fbec521238..b233614fa1e 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -35,6 +35,7 @@ extern char * mysql_unix_port; CLIENT_MULTI_RESULTS | \ CLIENT_PS_MULTI_RESULTS | \ CLIENT_PLUGIN_AUTH | \ + CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_CONNECT_ATTRS) sig_handler my_pipe_sig_handler(int sig); |