mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-19 06:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-22100 TokuDB compilation error

Browse source 
fix TokuDB to compile with the perfschema
This commit is contained in:
Sergei Golubchik 2020-09-23 12:24:16 +02:00
commit 606a281162
3 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/tokudb/ha_tokudb.cc
View file

@ -6387,7 +6387,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
"created master %p",
trx->all);
trx->sp_level = trx->all;
trans_register_ha(thd, true, tokudb_hton);
trans_register_ha(thd, true, tokudb_hton, 0);
}
DBUG_PRINT("trans", ("starting transaction stmt"));
if (trx->stmt) {
@ -6429,7 +6429,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
trx->sp_level,
trx->stmt);
reset_stmt_progress(&trx->stmt_progress);
trans_register_ha(thd, false, tokudb_hton);
trans_register_ha(thd, false, tokudb_hton, 0);
cleanup:
return error;
}
@ -6594,7 +6594,7 @@ int ha_tokudb::start_stmt(THD* thd, thr_lock_type lock_type) {
share->rows_from_locked_table = added_rows - deleted_rows;
}
transaction = trx->sub_sp_level;
trans_register_ha(thd, false, tokudb_hton);
trans_register_ha(thd, false, tokudb_hton, 0);
cleanup:
TOKUDB_HANDLER_DBUG_RETURN(error);
}

2
storage/tokudb/ha_tokudb_alter_56.cc
View file

@ -57,7 +57,7 @@ public:
expand_varchar_update_needed(false),
expand_fixed_update_needed(false),
expand_blob_update_needed(false),
optimize_needed(false),
optimize_needed(false), changed_fields(PSI_INSTRUMENT_MEM),
table_kc_info(NULL),
altered_table_kc_info(NULL) {
}

12
storage/tokudb/tokudb_memory.h
View file

@ -40,31 +40,19 @@ void* multi_malloc(myf myFlags, ...);
inline void* malloc(size_t s, myf flags) {
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return ::my_malloc(0, s, flags);
#else
return ::my_malloc(s, flags);
#endif
}
inline void* realloc(void* p, size_t s, myf flags) {
if (s == 0)
return p;
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return ::my_realloc(0, p, s, flags);
#else
return ::my_realloc(p, s, flags | MY_ALLOW_ZERO_PTR);
#endif
}
inline void free(void* ptr) {
if (ptr)
::my_free(ptr);
}
inline char* strdup(const char* p, myf flags) {
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return ::my_strdup(0, p, flags);
#else
return ::my_strdup(p, flags);
#endif
}
inline void* multi_malloc(myf myFlags, ...) {
va_list args;