Merge branch '2.3' into 2.4

2019-10-07 16:17:53 +03:00
parent 4791e043f1 e7e40b0179
commit 312469dca2
7 changed files with 44 additions and 18 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/tool/mkkeywordhash.c
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/tool/mkkeywordhash.c
@ -381,6 +381,7 @@ static Keyword aKeywordTable[] = {
 #ifdef MAXSCALE
  { "PARTITION",        "TK_PARTITION",    ALWAYS                 },
  { "PARTITIONS",       "TK_PARTITIONS",   ALWAYS                 },
+  { "PASSWORD",         "TK_PASSWORD",     ALWAYS                 },
  { "PERSISTENT",       "TK_PERSISTENT",   ALWAYS                 },
 #endif
 #ifndef MAXSCALE