Skip to content

Commit 606a281

Browse files
committed
MDEV-22100 TokuDB compilation error
fix TokuDB to compile with the perfschema
1 parent 73a2ae9 commit 606a281

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

storage/tokudb/ha_tokudb.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6387,7 +6387,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
63876387
"created master %p",
63886388
trx->all);
63896389
trx->sp_level = trx->all;
6390-
trans_register_ha(thd, true, tokudb_hton);
6390+
trans_register_ha(thd, true, tokudb_hton, 0);
63916391
}
63926392
DBUG_PRINT("trans", ("starting transaction stmt"));
63936393
if (trx->stmt) {
@@ -6429,7 +6429,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
64296429
trx->sp_level,
64306430
trx->stmt);
64316431
reset_stmt_progress(&trx->stmt_progress);
6432-
trans_register_ha(thd, false, tokudb_hton);
6432+
trans_register_ha(thd, false, tokudb_hton, 0);
64336433
cleanup:
64346434
return error;
64356435
}
@@ -6594,7 +6594,7 @@ int ha_tokudb::start_stmt(THD* thd, thr_lock_type lock_type) {
65946594
share->rows_from_locked_table = added_rows - deleted_rows;
65956595
}
65966596
transaction = trx->sub_sp_level;
6597-
trans_register_ha(thd, false, tokudb_hton);
6597+
trans_register_ha(thd, false, tokudb_hton, 0);
65986598
cleanup:
65996599
TOKUDB_HANDLER_DBUG_RETURN(error);
66006600
}

storage/tokudb/ha_tokudb_alter_56.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class tokudb_alter_ctx : public inplace_alter_handler_ctx {
5757
expand_varchar_update_needed(false),
5858
expand_fixed_update_needed(false),
5959
expand_blob_update_needed(false),
60-
optimize_needed(false),
60+
optimize_needed(false), changed_fields(PSI_INSTRUMENT_MEM),
6161
table_kc_info(NULL),
6262
altered_table_kc_info(NULL) {
6363
}

storage/tokudb/tokudb_memory.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,19 @@ void* multi_malloc(myf myFlags, ...);
4040

4141

4242
inline void* malloc(size_t s, myf flags) {
43-
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
4443
return ::my_malloc(0, s, flags);
45-
#else
46-
return ::my_malloc(s, flags);
47-
#endif
4844
}
4945
inline void* realloc(void* p, size_t s, myf flags) {
5046
if (s == 0)
5147
return p;
52-
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
5348
return ::my_realloc(0, p, s, flags);
54-
#else
55-
return ::my_realloc(p, s, flags | MY_ALLOW_ZERO_PTR);
56-
#endif
5749
}
5850
inline void free(void* ptr) {
5951
if (ptr)
6052
::my_free(ptr);
6153
}
6254
inline char* strdup(const char* p, myf flags) {
63-
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
6455
return ::my_strdup(0, p, flags);
65-
#else
66-
return ::my_strdup(p, flags);
67-
#endif
6856
}
6957
inline void* multi_malloc(myf myFlags, ...) {
7058
va_list args;

0 commit comments

Comments
 (0)