Merge branch '2.1' into develop

2017-08-15 10:31:30 +03:00
parent 49ba1f8fa0 3485a32731
commit de7004cb95
12 changed files with 24 additions and 24 deletions
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@ -4259,7 +4259,7 @@ static int32_t qc_sqlite_process_init(void)
        {
            if (this_unit.log_level != QC_LOG_NOTHING)
            {
-                const char* message;
+                const char* message = NULL;

                switch (this_unit.log_level)
                {