Merge branch '2.0' into 2.1

2017-03-07 11:45:00 +02:00
parent a7379d7ae2 60c69d0f7f
commit a6ae60c808
6 changed files with 84 additions and 0 deletions
--- a/query_classifier/qc_sqlite/qc_sqlite.c
+++ b/query_classifier/qc_sqlite/qc_sqlite.c
@ -1778,6 +1778,17 @@ void mxs_sqlite3Update(Parse* pParse, SrcList* pTabList, ExprList* pChanges, Exp
    exposed_sqlite3ExprDelete(pParse->db, pWhere);
 }

+void mxs_sqlite3Savepoint(Parse *pParse, int op, Token *pName)
+{
+    QC_TRACE();
+
+    QC_SQLITE_INFO* info = this_thread.info;
+    ss_dassert(info);
+
+    info->status = QC_QUERY_PARSED;
+    info->type_mask = QUERY_TYPE_WRITE;
+}
+
 void maxscaleCollectInfoFromSelect(Parse* pParse, Select* pSelect, int sub_select)
 {
    QC_SQLITE_INFO* info = this_thread.info;