diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-02-27 18:00:01 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-02-27 18:00:01 +0100 |
| commit | 43362bc9a005edff28b0470789cd8d9571b022cb (patch) | |
| tree | a3f7a12489a41c7d5a8a4b0809d74764966da72b /storage/connect/user_connect.cc | |
| parent | 1699947eef6a73d69ec759b882bebae8bf94fa16 (diff) | |
| download | mariadb-git-43362bc9a005edff28b0470789cd8d9571b022cb.tar.gz | |
- Fix bug MDEV-5734
modified:
storage/connect/mysql-test/connect/r/pivot.result
storage/connect/mysql-test/connect/t/pivot.test
storage/connect/tabmysql.cpp
storage/connect/tabpivot.cpp
- Implement a first experimental support of MRR
(compiled only if MRRBKA_SUPPORT is defined)
modified:
storage/connect/colblk.h
storage/connect/connect.cc
storage/connect/connect.h
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/plugutil.c
storage/connect/user_connect.cc
Diffstat (limited to 'storage/connect/user_connect.cc')
| -rw-r--r-- | storage/connect/user_connect.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/connect/user_connect.cc b/storage/connect/user_connect.cc index b778d3f0883..3a48c491cb8 100644 --- a/storage/connect/user_connect.cc +++ b/storage/connect/user_connect.cc @@ -147,6 +147,9 @@ bool user_connect::CheckCleanup(void) g->Xchk = NULL; g->Createas = 0; g->Alchecked = 0; +#if defined(MRRBKA_SUPPORT) + g->Mrr = 0; +#endif // MRRBKA_SUPPORT last_query_id= thdp->query_id; if (xtrace) |