Merge branch 'release-1.0GA' into firewall

Conflicts: log_manager/log_manager.cc
2014-12-04 17:13:41 +02:00
parent 0060bbb7df c133a42bbd
commit 12d6d81fa8
37 changed files with 630 additions and 297 deletions
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@ -619,6 +619,7 @@ static skygw_query_type_t resolve_query_type(
                        break;

                case SQLCOM_SELECT:
+		case SQLCOM_SHOW_SLAVE_STAT:
                        type |= QUERY_TYPE_READ;
                        break;