1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-13836 mariadb_config & mysql_config output differ

Browse Source 
allow to build with the default port number 3306.
Now -DMYSQL_TCP_PORT=# sets the default port name and
-DMYSQL_TCP_PORT_DEFAULT=# sets the magic port=0 behavior,
if it's MYSQL_TCP_PORT_DEFAULT=0 it's enabled, otherwise - disabled.
This commit is contained in:
Sergei Golubchik 2017-10-11 21:53:43 +02:00
parent a75884e701
commit 30faf331b8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/mysql_version.cmake
View File

@ -69,13 +69,9 @@ ENDMACRO()
# Get mysql version and other interesting variables
GET_MYSQL_VERSION()
SET(MYSQL_TCP_PORT_DEFAULT "3306")
SET(MYSQL_TCP_PORT_DEFAULT 0)
IF(NOT MYSQL_TCP_PORT)
SET(MYSQL_TCP_PORT ${MYSQL_TCP_PORT_DEFAULT})
SET(MYSQL_TCP_PORT_DEFAULT "0")
ELSEIF(MYSQL_TCP_PORT EQUAL MYSQL_TCP_PORT_DEFAULT)
SET(MYSQL_TCP_PORT_DEFAULT "0")
SET(MYSQL_TCP_PORT 3306)
ENDIF()
IF(NOT COMPILATION_COMMENT)