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

Merge branch 'develop' into 1.2.1-binlog_router_trx

Browse Source
This commit is contained in:
Markus Makela
2015-11-02 18:09:59 +02:00
parent 99720ffa9f 9b4e8223b4
commit 7c582f91ea
24 changed files with 2962 additions and 2258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,14 @@
*
* @endverbatim
*/
#ifndef PCRE2_CODE_UNIT_WIDTH
#define PCRE2_CODE_UNIT_WIDTH 8
#endif
#include <dcb.h>
#include <hashtable.h>
#include <mysql_client_server_protocol.h>
#include <pcre.h>
#include <pcre2.h>
/**
* Bitmask values for the router session's initialization. These values are used
* to prevent responses from internal commands being forwarded to the client.
@ -330,9 +333,10 @@ typedef struct router_instance {
HASHTABLE* ignored_dbs; /*< List of databases to ignore when the
* database mapping finds multiple servers
* with the same database */
pcre* ignore_regex; /*< Databases matching this regex will
pcre2_code* ignore_regex; /*< Databases matching this regex will
* not cause the session to be terminated
* if they are found on more than one server. */
pcre2_match_data* ignore_match_data;
} ROUTER_INSTANCE;