Merge branch 'develop' into MAX-324

2015-02-06 23:27:59 +02:00
parent 4c16eb55a2 6e3e4ef20a
commit 0d4761ade8
25 changed files with 59552 additions and 959 deletions
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@ -495,10 +495,19 @@ static skygw_query_type_t resolve_query_type(
 		{
 			type |= QUERY_TYPE_GSYSVAR_WRITE;
 		}
+                
+                /*
+                 * SHOW GLOBAL STATUS - Route to master
+                 */
+                else if (lex->sql_command == SQLCOM_SHOW_STATUS)
+                {
+                        type = QUERY_TYPE_WRITE;
+                }
 		/**
 		 * REVOKE ALL, ASSIGN_TO_KEYCACHE,
 		 * PRELOAD_KEYS, FLUSH, RESET, CREATE|ALTER|DROP SERVER
 		 */
+                
 		else 
 		{
 			type |= QUERY_TYPE_GSYSVAR_WRITE;