hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into schemarouter_refresh

Browse Source
This commit is contained in:
Markus Makela
2015-06-15 08:46:05 +03:00
parent f6f5de92eb d3cc9be52e
commit c2d69850de
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
View File

@ -28,7 +28,7 @@ You will need to install all of the following packages for all versions of RHEL,
``` ```
gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool
openssl-devel libaio libaio-devel librabbitmq-devel openssl-devel libaio libaio-devel librabbitmq-devel libcurl-devel pcre-devel
``` ```
In addition, if you wish to to build an RPM package include: In addition, if you wish to to build an RPM package include:
@ -68,7 +68,7 @@ These packages are required on all versions of Ubuntu and Debian.
``` ```
build-essential libssl-dev libaio-dev ncurses-dev bison build-essential libssl-dev libaio-dev ncurses-dev bison
cmake perl libtool librabbitmq-dev cmake perl libtool librabbitmq-dev libcurl-dev libpcre3-dev
``` ```
If you want to build a DEB package, you will also need: If you want to build a DEB package, you will also need:

1
server/modules/include/schemarouter.h
View File

@ -316,7 +316,6 @@ typedef struct router_instance {
struct router_instance* next; /*< Next router on the list */ struct router_instance* next; /*< Next router on the list */
bool available_slaves; /*< The router has some slaves available */ bool available_slaves; /*< The router has some slaves available */
} ROUTER_INSTANCE; } ROUTER_INSTANCE;
#define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER : \ #define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER : \