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

Merge branch 'develop' into firewall

Browse Source
This commit is contained in:
Markus Makela
2014-11-03 09:26:31 +02:00
parent f8f6006314 b15ac9c019
commit b7f9819407
16 changed files with 312 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/query_classifier.cc
View File

@ -595,8 +595,8 @@ static skygw_query_type_t resolve_query_type(
/** Written to binlog, that is, replicated except tmp tables */
type |= QUERY_TYPE_WRITE; /*< to master */
if (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE &&
lex->sql_command == SQLCOM_CREATE_TABLE)
if (lex->sql_command == SQLCOM_CREATE_TABLE &&
(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
{
type |= QUERY_TYPE_CREATE_TMP_TABLE; /*< remember in router */
}

6
query_classifier/test/canonical_tests/canonizer.c
View File

@ -1,4 +1,3 @@
#include <my_config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -8,7 +7,7 @@
#include <mysql.h>
static char* server_options[] = {
"MariaDB Corporation MaxScale",
"SkySQL Gateway",
"--datadir=./",
"--language=./",
"--skip-innodb",
@ -52,12 +51,13 @@ int main(int argc, char** argv)
fsz = lseek(fdin,0,SEEK_END);
lseek(fdin,0,SEEK_SET);
if(!(buffer = malloc(sizeof(char)*fsz))){
if(!(buffer = malloc(sizeof(char)*fsz + 1))){
printf("Error: Failed to allocate memory.");
return 1;
}
read(fdin,buffer,fsz);
buffer[fsz] = '\0';