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/global.h | |
| 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/global.h')
| -rw-r--r-- | storage/connect/global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/connect/global.h b/storage/connect/global.h index 8bccd742a64..374ba6e4177 100644 --- a/storage/connect/global.h +++ b/storage/connect/global.h @@ -222,6 +222,9 @@ typedef struct _global { /* Global structure */ int Createas; /* To pass info to created table */ void *Xchk; /* indexes in create/alter */ short Alchecked; /* Checked for ALTER */ +#if defined(MRRBKA_SUPPORT) + short Mrr; /* True when doing mrr */ +#endif // MRRBKA_SUPPORT short Trace; int jump_level; jmp_buf jumper[MAX_JUMP + 2]; |