diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-23 10:32:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-23 10:32:21 +0300 |
commit | 826f9d4f7e99973cafe7654697d7c50b8b64b76b (patch) | |
tree | 8e41c3a90d40c21c37fcbd0658afe7d349865540 /sql/ha_partition.h | |
parent | e5d71e0b3d3ebd4e69526002720f93d62a3fd641 (diff) | |
parent | 31fe70290c54c44231aed881f5138924f32e47c5 (diff) | |
download | mariadb-git-826f9d4f7e99973cafe7654697d7c50b8b64b76b.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r-- | sql/ha_partition.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index caeff8a25aa..d538abc69ed 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "sql_partition.h" /* part_id_range, partition_element */ #include "queues.h" /* QUEUE */ @@ -1441,18 +1441,6 @@ public: void append_row_to_str(String &str); public: - /* - ------------------------------------------------------------------------- - Admin commands not supported currently (almost purely MyISAM routines) - This means that the following methods are not implemented: - ------------------------------------------------------------------------- - - virtual int backup(TD* thd, HA_CHECK_OPT *check_opt); - virtual int restore(THD* thd, HA_CHECK_OPT *check_opt); - virtual int dump(THD* thd, int fd = -1); - virtual int net_read_dump(NET* net); - */ - virtual uint checksum() const; /* Enabled keycache for performance reasons, WL#4571 */ virtual int assign_to_keycache(THD* thd, HA_CHECK_OPT *check_opt); virtual int preload_keys(THD* thd, HA_CHECK_OPT* check_opt); |