diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
| commit | 2f7b37b02154748b223e385a7d7787900ab37b5e (patch) | |
| tree | 49a5ab1928bd840c129bd14ce72c5cf2c0190e20 /plugin/handler_socket | |
| parent | 7f03b1d78f2aab738e38a1e33ac887757604585a (diff) | |
| parent | b811c6ecc74cc1421eedc92573447768d1eb7980 (diff) | |
| download | mariadb-git-2f7b37b02154748b223e385a7d7787900ab37b5e.tar.gz | |
Merge 10.3 into 10.4, except MDEV-22543
Also, fix GCC -Og -Wmaybe-uninitialized in run_backup_stage()
Diffstat (limited to 'plugin/handler_socket')
| -rw-r--r-- | plugin/handler_socket/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt index 329ff58d7f2..5a1925b40e0 100644 --- a/plugin/handler_socket/CMakeLists.txt +++ b/plugin/handler_socket/CMakeLists.txt @@ -1,7 +1,8 @@ -IF(WIN32) +IF(WIN32 OR WITHOUT_SERVER) # Handlersocket does not compile on Windows, compiles but does - # not start on FreeBSD. + # not start on FreeBSD. + # It is a server plugin and disable it explicitly here. RETURN() ENDIF() |