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

Merge remote-tracking branch 'origin/Z3' into MAX-237

Browse Source 
Conflicts:
	query_classifier/query_classifier.cc
	query_classifier/query_classifier.h
	server/modules/routing/readwritesplit/readwritesplit.c
This commit is contained in:
Markus Makela
2014-09-01 11:05:10 +03:00
parent 067ce3c886 40f85f9cad
commit a17e584adb
46 changed files with 3473 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
query_classifier/query_classifier.cc
View File

@ -512,7 +512,15 @@ static skygw_query_type_t resolve_query_type(
}
else if (lex->option_type == OPT_SESSION)
{
type |= QUERY_TYPE_SESSION_WRITE;
/** SHOW commands are all reads to one backend */
if (lex->sql_command == SQLCOM_SHOW_VARIABLES)
{
type |= QUERY_TYPE_SESSION_READ;
}
else
{
type |= QUERY_TYPE_SESSION_WRITE;
}
goto return_qtype;
}
/**
@ -542,7 +550,6 @@ static skygw_query_type_t resolve_query_type(
}
}
goto return_qtype;
}