Merge branch '2.3' into develop

2019-06-11 13:54:51 +03:00
parent 40851f8a30 acc5863fe2
commit 1e3da20409
2 changed files with 14 additions and 2 deletions
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@ -889,9 +889,18 @@ public:
                        }
                    }
                }
-                else if (zToken[0] != '?')
+                else
                {
-                    MXS_WARNING("%s reported as VARIABLE.", zToken);
+                    // '?' is always accepted as a positional parameter.
+                    if (zToken[0] != '?')
+                    {
+                        // If the mode is Oracle then :N is accepted as well.
+                        if (zToken[0] != ':' || this_thread.sql_mode != QC_SQL_MODE_ORACLE)
+                        {
+                            // Everything else is unexpected, but harmless.
+                            MXS_WARNING("%s reported as VARIABLE.", zToken);
+                        }
+                    }
                }
            }
            break;