diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-02 08:19:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-02 08:19:57 +0300 |
| commit | ef3070e997a6e90c8eadaa833dc47324c2167bb4 (patch) | |
| tree | cea18cf54188376147d7e4457397c9c663022f27 /storage/innobase/include/fts0ast.h | |
| parent | a90b3862d921ebaeaf3c998cd742e883d2d4af04 (diff) | |
| parent | 2fb68244b4246221e4f605749913bfe582a4d040 (diff) | |
| download | mariadb-git-ef3070e997a6e90c8eadaa833dc47324c2167bb4.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/fts0ast.h')
| -rw-r--r-- | storage/innobase/include/fts0ast.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/fts0ast.h b/storage/innobase/include/fts0ast.h index b5187ce2a41..2a2b25c36bd 100644 --- a/storage/innobase/include/fts0ast.h +++ b/storage/innobase/include/fts0ast.h @@ -1,6 +1,7 @@ /***************************************************************************** -Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2007, 2018, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2016, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -296,6 +297,8 @@ struct fts_ast_node_t { fts_ast_node_t* next_alloc; /*!< For tracking allocations */ bool visited; /*!< whether this node is already processed */ + /** current transaction */ + const trx_t* trx; /* Used by plugin parser */ fts_ast_node_t* up_node; /*!< Direct up node */ bool go_up; /*!< Flag if go one level up */ |