summaryrefslogtreecommitdiff
path: root/storage/connect/plugutil.c
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-02-27 18:00:01 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2014-02-27 18:00:01 +0100
commit43362bc9a005edff28b0470789cd8d9571b022cb (patch)
treea3f7a12489a41c7d5a8a4b0809d74764966da72b /storage/connect/plugutil.c
parent1699947eef6a73d69ec759b882bebae8bf94fa16 (diff)
downloadmariadb-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/plugutil.c')
-rw-r--r--storage/connect/plugutil.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 91b850022fb..e6d452aaf97 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -153,6 +153,9 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize)
g->Trace = 0;
g->Createas = 0;
g->Alchecked = 0;
+#if defined(MRRBKA_SUPPORT)
+ g->Mrr = 0;
+#endif // MRRBKA_SUPPORT
g->Activityp = g->ActivityStart = NULL;
g->Xchk = NULL;
strcpy(g->Message, "");