Merge branch '2.2' into develop

2018-09-27 11:40:14 +03:00
parent df3d08b959 62ce6c15dc
commit 66227301aa
15 changed files with 281 additions and 28 deletions
--- a/query_classifier/test/expected.sql
+++ b/query_classifier/test/expected.sql
@ -24,3 +24,4 @@ QUERY_TYPE_READ|QUERY_TYPE_WRITE
 QUERY_TYPE_READ|QUERY_TYPE_WRITE
 QUERY_TYPE_READ|QUERY_TYPE_WRITE
 QUERY_TYPE_DEALLOC_PREPARE
+QUERY_TYPE_WRITE
--- a/query_classifier/test/input.sql
+++ b/query_classifier/test/input.sql
@ -24,3 +24,4 @@ SELECT IS_FREE_LOCK('lock1');
 SELECT IS_USED_LOCK('lock1');
 SELECT RELEASE_LOCK('lock1');
 deallocate prepare select_stmt;
+SELECT a FROM tbl FOR UPDATE;