Merge branch 'develop' into firewall

This commit is contained in:
Markus Makela
2014-11-05 15:28:22 +02:00
17 changed files with 151 additions and 59 deletions

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){