Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
606a2811
Commit
606a2811
authored
Sep 23, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-22100 TokuDB compilation error
fix TokuDB to compile with the perfschema
parent
73a2ae9f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
16 deletions
+4
-16
storage/tokudb/ha_tokudb.cc
storage/tokudb/ha_tokudb.cc
+3
-3
storage/tokudb/ha_tokudb_alter_56.cc
storage/tokudb/ha_tokudb_alter_56.cc
+1
-1
storage/tokudb/tokudb_memory.h
storage/tokudb/tokudb_memory.h
+0
-12
No files found.
storage/tokudb/ha_tokudb.cc
View file @
606a2811
...
@@ -6387,7 +6387,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
...
@@ -6387,7 +6387,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
"created master %p"
,
"created master %p"
,
trx
->
all
);
trx
->
all
);
trx
->
sp_level
=
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"
));
DBUG_PRINT
(
"trans"
,
(
"starting transaction stmt"
));
if
(
trx
->
stmt
)
{
if
(
trx
->
stmt
)
{
...
@@ -6429,7 +6429,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
...
@@ -6429,7 +6429,7 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
trx
->
sp_level
,
trx
->
sp_level
,
trx
->
stmt
);
trx
->
stmt
);
reset_stmt_progress
(
&
trx
->
stmt_progress
);
reset_stmt_progress
(
&
trx
->
stmt_progress
);
trans_register_ha
(
thd
,
false
,
tokudb_hton
);
trans_register_ha
(
thd
,
false
,
tokudb_hton
,
0
);
cleanup:
cleanup:
return
error
;
return
error
;
}
}
...
@@ -6594,7 +6594,7 @@ int ha_tokudb::start_stmt(THD* thd, thr_lock_type lock_type) {
...
@@ -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
;
share
->
rows_from_locked_table
=
added_rows
-
deleted_rows
;
}
}
transaction
=
trx
->
sub_sp_level
;
transaction
=
trx
->
sub_sp_level
;
trans_register_ha
(
thd
,
false
,
tokudb_hton
);
trans_register_ha
(
thd
,
false
,
tokudb_hton
,
0
);
cleanup:
cleanup:
TOKUDB_HANDLER_DBUG_RETURN
(
error
);
TOKUDB_HANDLER_DBUG_RETURN
(
error
);
}
}
...
...
storage/tokudb/ha_tokudb_alter_56.cc
View file @
606a2811
...
@@ -57,7 +57,7 @@ class tokudb_alter_ctx : public inplace_alter_handler_ctx {
...
@@ -57,7 +57,7 @@ class tokudb_alter_ctx : public inplace_alter_handler_ctx {
expand_varchar_update_needed
(
false
),
expand_varchar_update_needed
(
false
),
expand_fixed_update_needed
(
false
),
expand_fixed_update_needed
(
false
),
expand_blob_update_needed
(
false
),
expand_blob_update_needed
(
false
),
optimize_needed
(
false
),
optimize_needed
(
false
),
changed_fields
(
PSI_INSTRUMENT_MEM
),
table_kc_info
(
NULL
),
table_kc_info
(
NULL
),
altered_table_kc_info
(
NULL
)
{
altered_table_kc_info
(
NULL
)
{
}
}
...
...
storage/tokudb/tokudb_memory.h
View file @
606a2811
...
@@ -40,31 +40,19 @@ void* multi_malloc(myf myFlags, ...);
...
@@ -40,31 +40,19 @@ void* multi_malloc(myf myFlags, ...);
inline
void
*
malloc
(
size_t
s
,
myf
flags
)
{
inline
void
*
malloc
(
size_t
s
,
myf
flags
)
{
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return
::
my_malloc
(
0
,
s
,
flags
);
return
::
my_malloc
(
0
,
s
,
flags
);
#else
return
::
my_malloc
(
s
,
flags
);
#endif
}
}
inline
void
*
realloc
(
void
*
p
,
size_t
s
,
myf
flags
)
{
inline
void
*
realloc
(
void
*
p
,
size_t
s
,
myf
flags
)
{
if
(
s
==
0
)
if
(
s
==
0
)
return
p
;
return
p
;
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return
::
my_realloc
(
0
,
p
,
s
,
flags
);
return
::
my_realloc
(
0
,
p
,
s
,
flags
);
#else
return
::
my_realloc
(
p
,
s
,
flags
|
MY_ALLOW_ZERO_PTR
);
#endif
}
}
inline
void
free
(
void
*
ptr
)
{
inline
void
free
(
void
*
ptr
)
{
if
(
ptr
)
if
(
ptr
)
::
my_free
(
ptr
);
::
my_free
(
ptr
);
}
}
inline
char
*
strdup
(
const
char
*
p
,
myf
flags
)
{
inline
char
*
strdup
(
const
char
*
p
,
myf
flags
)
{
#if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
return
::
my_strdup
(
0
,
p
,
flags
);
return
::
my_strdup
(
0
,
p
,
flags
);
#else
return
::
my_strdup
(
p
,
flags
);
#endif
}
}
inline
void
*
multi_malloc
(
myf
myFlags
,
...)
{
inline
void
*
multi_malloc
(
myf
myFlags
,
...)
{
va_list
args
;
va_list
args
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment