File tree Expand file tree Collapse file tree 4 files changed +3
-13
lines changed Expand file tree Collapse file tree 4 files changed +3
-13
lines changed Original file line number Diff line number Diff line change 11/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
2- Copyright (c) 1995, 2018 , MariaDB Corporation.
2+ Copyright (c) 1995, 2021 , MariaDB Corporation.
33
44 This program is free software; you can redistribute it and/or modify
55 it under the terms of the GNU General Public License as published by
@@ -213,9 +213,7 @@ enum ha_extra_function {
213213 /** Start writing rows during ALTER TABLE...ALGORITHM=COPY. */
214214 HA_EXTRA_BEGIN_ALTER_COPY ,
215215 /** Finish writing rows during ALTER TABLE...ALGORITHM=COPY. */
216- HA_EXTRA_END_ALTER_COPY ,
217- /** Fake the start of a statement after wsrep_load_data_splitting hack */
218- HA_EXTRA_FAKE_START_STMT
216+ HA_EXTRA_END_ALTER_COPY
219217};
220218
221219/* Compatible option, to be deleted in 6.0 */
Original file line number Diff line number Diff line change 11/*
22 Copyright (c) 2005, 2019, Oracle and/or its affiliates.
3- Copyright (c) 2009, 2020 , MariaDB
3+ Copyright (c) 2009, 2021 , MariaDB
44
55 This program is free software; you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -9060,7 +9060,6 @@ int ha_partition::extra(enum ha_extra_function operation)
90609060 case HA_EXTRA_STARTING_ORDERED_INDEX_SCAN:
90619061 case HA_EXTRA_BEGIN_ALTER_COPY:
90629062 case HA_EXTRA_END_ALTER_COPY:
9063- case HA_EXTRA_FAKE_START_STMT:
90649063 DBUG_RETURN (loop_partitions (extra_cb, &operation));
90659064 default :
90669065 {
Original file line number Diff line number Diff line change @@ -15318,10 +15318,6 @@ ha_innobase::extra(
1531815318case HA_EXTRA_END_ALTER_COPY:
1531915319m_prebuilt->table->skip_alter_undo = 0;
1532015320break;
15321- case HA_EXTRA_FAKE_START_STMT:
15322- trx_register_for_2pc(m_prebuilt->trx);
15323- m_prebuilt->sql_stat_start = true;
15324- break;
1532515321default:/* Do nothing */
1532615322;
1532715323}
Original file line number Diff line number Diff line change @@ -550,9 +550,6 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation)
550550 case HA_EXTRA_END_ALTER_COPY:
551551 inspected = "HA_EXTRA_END_ALTER_COPY";
552552 break;
553- case HA_EXTRA_FAKE_START_STMT:
554- inspected = "HA_EXTRA_FAKE_START_STMT";
555- break;
556553#ifdef MRN_HAVE_HA_EXTRA_EXPORT
557554 case HA_EXTRA_EXPORT:
558555 inspected = "HA_EXTRA_EXPORT";
You can’t perform that action at this time.
0 commit comments