Skip to content

Commit 6097317

Browse files
author
Justin Jose
committed
Merge branch 'mysql-8.0' into mysql-trunk
Change-Id: Ib17fbaf1390690b948eb399522bdc6035606ae4d
2 parents 859367f + 9019470 commit 6097317

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎sql/log_event.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ class Query_log_event : public virtual mysql::binlog::event::Query_event,
14001400
if (data_buf) my_free(data_buf);
14011401
}
14021402

1403-
virtual void claim_memory_ownership(bool claim) override;
1403+
void claim_memory_ownership(bool claim) override;
14041404

14051405
#ifdef MYSQL_SERVER
14061406
bool write(Basic_ostream *ostream) override;
@@ -1564,7 +1564,7 @@ class Format_description_log_event
15641564
FORMAT_DESCRIPTION_HEADER_LEN;
15651565
}
15661566

1567-
virtual void claim_memory_ownership(bool claim) override;
1567+
void claim_memory_ownership(bool claim) override;
15681568

15691569
protected:
15701570
#if defined(MYSQL_SERVER)
@@ -1626,7 +1626,7 @@ class Intvar_log_event : public mysql::binlog::event::Intvar_event,
16261626
const mysql::binlog::event::Format_description_event *description_event);
16271627
~Intvar_log_event() override = default;
16281628

1629-
virtual void claim_memory_ownership(bool claim) override;
1629+
void claim_memory_ownership(bool claim) override;
16301630

16311631
size_t get_data_size() override {
16321632
return 9; /* sizeof(type) + sizeof(val) */
@@ -1699,7 +1699,7 @@ class Rand_log_event : public mysql::binlog::event::Rand_event,
16991699
const mysql::binlog::event::Format_description_event *description_event);
17001700
~Rand_log_event() override = default;
17011701

1702-
virtual void claim_memory_ownership(bool claim) override;
1702+
void claim_memory_ownership(bool claim) override;
17031703

17041704
size_t get_data_size() override { return 16; /* sizeof(ulonglong) * 2*/ }
17051705
#ifdef MYSQL_SERVER
@@ -1792,7 +1792,7 @@ class Xid_log_event : public mysql::binlog::event::Xid_event,
17921792
const mysql::binlog::event::Format_description_event *description_event);
17931793
~Xid_log_event() override = default;
17941794

1795-
virtual void claim_memory_ownership(bool claim) override;
1795+
void claim_memory_ownership(bool claim) override;
17961796

17971797
size_t get_data_size() override { return sizeof(xid); }
17981798
#ifdef MYSQL_SERVER
@@ -1846,7 +1846,7 @@ class XA_prepare_log_event : public mysql::binlog::event::XA_prepare_event,
18461846
return xid_bufs_size + my_xid.gtrid_length + my_xid.bqual_length;
18471847
}
18481848

1849-
virtual void claim_memory_ownership(bool claim) override;
1849+
void claim_memory_ownership(bool claim) override;
18501850

18511851
#ifdef MYSQL_SERVER
18521852
bool write(Basic_ostream *ostream) override;
@@ -1914,7 +1914,7 @@ class User_var_log_event : public mysql::binlog::event::User_var_event,
19141914
const mysql::binlog::event::Format_description_event *description_event);
19151915
~User_var_log_event() override = default;
19161916

1917-
virtual void claim_memory_ownership(bool claim) override;
1917+
void claim_memory_ownership(bool claim) override;
19181918

19191919
#ifdef MYSQL_SERVER
19201920
bool write(Basic_ostream *ostream) override;
@@ -1982,7 +1982,7 @@ class Stop_log_event : public mysql::binlog::event::Stop_event,
19821982
return mysql::binlog::event::STOP_EVENT;
19831983
}
19841984

1985-
virtual void claim_memory_ownership(bool claim) override;
1985+
void claim_memory_ownership(bool claim) override;
19861986

19871987
private:
19881988
#if defined(MYSQL_SERVER)
@@ -2050,7 +2050,7 @@ class Rotate_log_event : public mysql::binlog::event::Rotate_event,
20502050
mysql::binlog::event::Binary_log_event::ROTATE_HEADER_LEN;
20512051
}
20522052

2053-
virtual void claim_memory_ownership(bool claim) override;
2053+
void claim_memory_ownership(bool claim) override;
20542054

20552055
#ifdef MYSQL_SERVER
20562056
bool write(Basic_ostream *ostream) override;
@@ -2113,7 +2113,7 @@ class Append_block_log_event
21132113
const mysql::binlog::event::Format_description_event *description_event);
21142114
~Append_block_log_event() override = default;
21152115

2116-
virtual void claim_memory_ownership(bool claim) override;
2116+
void claim_memory_ownership(bool claim) override;
21172117

21182118
size_t get_data_size() override {
21192119
return block_len +
@@ -2183,7 +2183,7 @@ class Delete_file_log_event : public mysql::binlog::event::Delete_file_event,
21832183
const mysql::binlog::event::Format_description_event *description_event);
21842184
~Delete_file_log_event() override = default;
21852185

2186-
virtual void claim_memory_ownership(bool claim) override;
2186+
void claim_memory_ownership(bool claim) override;
21872187

21882188
size_t get_data_size() override {
21892189
return mysql::binlog::event::Binary_log_event::DELETE_FILE_HEADER_LEN;
@@ -2261,7 +2261,7 @@ class Begin_load_query_log_event
22612261
const mysql::binlog::event::Format_description_event *description_event);
22622262
~Begin_load_query_log_event() override = default;
22632263

2264-
virtual void claim_memory_ownership(bool claim) override;
2264+
void claim_memory_ownership(bool claim) override;
22652265

22662266
private:
22672267
#if defined(MYSQL_SERVER)
@@ -2334,7 +2334,7 @@ class Execute_load_query_log_event
23342334

23352335
bool is_sbr_logging_format() const override { return true; }
23362336

2337-
virtual void claim_memory_ownership(bool claim) override;
2337+
void claim_memory_ownership(bool claim) override;
23382338

23392339
private:
23402340
#if defined(MYSQL_SERVER)
@@ -2484,7 +2484,7 @@ class Table_map_log_event : public mysql::binlog::event::Table_map_event,
24842484
const char *buf,
24852485
const mysql::binlog::event::Format_description_event *description_event);
24862486

2487-
virtual void claim_memory_ownership(bool claim) override;
2487+
void claim_memory_ownership(bool claim) override;
24882488

24892489
~Table_map_log_event() override;
24902490

@@ -3334,7 +3334,7 @@ class Write_rows_log_event : public Rows_log_event,
33343334
}
33353335
#endif
33363336

3337-
virtual void claim_memory_ownership(bool claim) override;
3337+
void claim_memory_ownership(bool claim) override;
33383338

33393339
protected:
33403340
int write_row(const Relay_log_info *const, const bool);
@@ -3435,7 +3435,7 @@ class Update_rows_log_event : public Rows_log_event,
34353435
}
34363436
#endif
34373437

3438-
virtual void claim_memory_ownership(bool claim) override;
3438+
void claim_memory_ownership(bool claim) override;
34393439

34403440
protected:
34413441
mysql::binlog::event::Log_event_type get_general_type_code() override {
@@ -3543,7 +3543,7 @@ class Delete_rows_log_event : public Rows_log_event,
35433543
}
35443544
#endif
35453545

3546-
virtual void claim_memory_ownership(bool claim) override;
3546+
void claim_memory_ownership(bool claim) override;
35473547

35483548
protected:
35493549
mysql::binlog::event::Log_event_type get_general_type_code() override {
@@ -3645,7 +3645,7 @@ class Incident_log_event : public mysql::binlog::event::Incident_event,
36453645

36463646
~Incident_log_event() override;
36473647

3648-
virtual void claim_memory_ownership(bool claim) override;
3648+
void claim_memory_ownership(bool claim) override;
36493649

36503650
#ifndef MYSQL_SERVER
36513651
void print(FILE *file, PRINT_EVENT_INFO *print_event_info) const override;
@@ -3718,7 +3718,7 @@ class Ignorable_log_event
37183718
const mysql::binlog::event::Format_description_event *descr_event);
37193719
~Ignorable_log_event() override;
37203720

3721-
virtual void claim_memory_ownership(bool claim) override;
3721+
void claim_memory_ownership(bool claim) override;
37223722

37233723
#ifdef MYSQL_SERVER
37243724
int pack_info(Protocol *) override;
@@ -3794,7 +3794,7 @@ class Rows_query_log_event : public Ignorable_log_event,
37943794
const char *buf,
37953795
const mysql::binlog::event::Format_description_event *descr_event);
37963796

3797-
virtual void claim_memory_ownership(bool claim) override;
3797+
void claim_memory_ownership(bool claim) override;
37983798

37993799
~Rows_query_log_event() override {
38003800
if (m_rows_query) my_free(m_rows_query);
@@ -3899,7 +3899,7 @@ class Transaction_payload_log_event
38993899

39003900
~Transaction_payload_log_event() override = default;
39013901

3902-
virtual void claim_memory_ownership(bool claim) override;
3902+
void claim_memory_ownership(bool claim) override;
39033903

39043904
#ifndef MYSQL_SERVER
39053905
void print(FILE *file, PRINT_EVENT_INFO *print_event_info) const override;
@@ -3992,7 +3992,7 @@ class Gtid_log_event : public mysql::binlog::event::Gtid_event,
39923992

39933993
~Gtid_log_event() override = default;
39943994

3995-
virtual void claim_memory_ownership(bool claim) override;
3995+
void claim_memory_ownership(bool claim) override;
39963996

39973997
size_t get_data_size() override {
39983998
DBUG_EXECUTE_IF("do_not_write_rpl_timestamps", return POST_HEADER_LENGTH;);
@@ -4198,7 +4198,7 @@ class Previous_gtids_log_event
41984198

41994199
size_t get_data_size() override { return buf_size; }
42004200

4201-
virtual void claim_memory_ownership(bool claim) override;
4201+
void claim_memory_ownership(bool claim) override;
42024202

42034203
#ifndef MYSQL_SERVER
42044204
void print(FILE *file, PRINT_EVENT_INFO *print_event_info) const override;
@@ -4332,7 +4332,7 @@ class Transaction_context_log_event
43324332

43334333
~Transaction_context_log_event() override;
43344334

4335-
virtual void claim_memory_ownership(bool claim) override;
4335+
void claim_memory_ownership(bool claim) override;
43364336

43374337
size_t get_data_size() override;
43384338

@@ -4461,7 +4461,7 @@ class View_change_log_event : public mysql::binlog::event::View_change_event,
44614461

44624462
~View_change_log_event() override;
44634463

4464-
virtual void claim_memory_ownership(bool claim) override;
4464+
void claim_memory_ownership(bool claim) override;
44654465

44664466
size_t get_data_size() override;
44674467

0 commit comments

Comments
 (0)