diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 14:29:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 14:29:22 +0300 |
| commit | cb9648a6b5041ca928e8da2d2571ba9df6d80e8a (patch) | |
| tree | 71f38ead40eb437df259c59a246a51fb80c6fc31 /storage/innobase/include/row0mysql.h | |
| parent | ef2e51c39637ace64b66fa82b834e31f0e4ef38a (diff) | |
| download | mariadb-git-cb9648a6b5041ca928e8da2d2571ba9df6d80e8a.tar.gz | |
Revert an InnoDB Memcached plugin fix that was merged from MySQL 5.6.37
Revert the following change, because Memcached is not present
in MariaDB Server. We had better avoid adding dead code.
commit d9bc5e03d788b958ce8c76e157239953db60adb2
Author: Aakanksha Verma <aakanksha.verma@oracle.com>
Date: Thu May 18 14:31:01 2017 +0530
Bug #24605783 MYSQL GOT SIGNAL 6 ASSERTION FAILURE
Diffstat (limited to 'storage/innobase/include/row0mysql.h')
| -rw-r--r-- | storage/innobase/include/row0mysql.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h index 043417333ab..f5f159fc414 100644 --- a/storage/innobase/include/row0mysql.h +++ b/storage/innobase/include/row0mysql.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2000, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -724,8 +724,6 @@ struct row_prebuilt_t { mem_heap_t* heap; /*!< memory heap from which these auxiliary structures are allocated when needed */ - mem_heap_t* cursor_heap; /*!< memory heap from which - innodb_api_buf is allocated per session*/ ins_node_t* ins_node; /*!< Innobase SQL insert node used to perform inserts to the table */ @@ -876,9 +874,6 @@ struct row_prebuilt_t { unsigned innodb_api:1; /*!< whether this is a InnoDB API query */ const rec_t* innodb_api_rec; /*!< InnoDB API search result */ - void* innodb_api_buf; /*!< Buffer holding copy of the physical - Innodb API search record */ - ulint innodb_api_rec_size; /*!< Size of the Innodb API record */ byte* srch_key_val1; /*!< buffer used in converting search key values from MySQL format to InnoDB format.*/ |