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-05 15:28:22 +02:00
parent 349557c264 d611622b23
commit 4f5bda7a8b
17 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
query_classifier/query_classifier.cc
View File

@ -1049,15 +1049,16 @@ char** skygw_get_table_names(GWBUF* querybuf,int* tblsize, bool fullnames)
TABLE_LIST* tbl;
int i = 0,
currtblsz = 0;
char **tables,
**tmp;
char **tables = NULL,
**tmp = NULL;
if((lex = get_lex(querybuf)) == NULL)
{
if( (lex = get_lex(querybuf)) == NULL ||
lex->current_select == NULL )
{
goto retblock;
}
lex->current_select = lex->all_selects_list;
lex->current_select = lex->all_selects_list;
while(lex->current_select){

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

@ -62,7 +62,7 @@ int main(int argc, char** argv)
*(qbuff->sbuf->data + 1) = (unsigned char)(psize>>8);
*(qbuff->sbuf->data + 2) = (unsigned char)(psize>>16);
*(qbuff->sbuf->data + 4) = 0x03;
strcpy((char*)(qbuff->start + 5),readbuff);
memcpy(qbuff->start + 5,readbuff,psize + 1);
parse_query(qbuff);
tok = skygw_get_canonical(qbuff);
fprintf(outfile,"%s\n",tok);

6
query_classifier/test/classify.c
View File

@ -45,8 +45,8 @@ int main(int argc, char** argv)
input = fopen(argv[1],"rb");
expected = fopen(argv[2],"rb");
while((rd = fread(buffer,sizeof(char),buffsz,input))){
memset(buffer,0,buffsz);
while((rd = fread(buffer,sizeof(char),buffsz - 1,input))){
/**Fill the read buffer*/
if(strsz + rd >= buffsz){
@ -167,7 +167,7 @@ int main(int argc, char** argv)
gwbuf_free(buff);
}
memset(buffer,0,buffsz);
}
fclose(input);
fclose(expected);