diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-23 16:27:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-23 19:05:13 +0200 |
| commit | 4040a17ea2d727225e5e9765d7cb044d88c305d9 (patch) | |
| tree | 35d01103b631bab8fa920d00205eadc45af41e08 /extra | |
| parent | 7a5eb003229f7561f8029075fa4a9e078d84b761 (diff) | |
| download | mariadb-git-4040a17ea2d727225e5e9765d7cb044d88c305d9.tar.gz | |
Compile mariabackup with its own copy of net_serv.cc
Don't use the server's version, that expects a valid THD.
Modify net_serv.cc not not use any THD if MYSQL_SERVER isn't defined.
This reverts commit aaddac5cd7b23795ee617ee6f8b5613eec343e79.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index 8aadf2ffe3a..78188d2f8e8 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -73,6 +73,7 @@ MYSQL_ADD_EXECUTABLE(mariabackup backup_mysql.cc backup_copy.cc encryption_plugin.cc + ${PROJECT_SOURCE_DIR}/sql/net_serv.cc ${NT_SERVICE_SOURCE} ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c COMPONENT backup |