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
d0fd44fc
Commit
d0fd44fc
authored
Feb 01, 2018
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes: MariaDB-fication of rdb_i_s_deadlock_info
parent
f457a113
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
...ge/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
+1
-0
storage/rocksdb/rdb_i_s.cc
storage/rocksdb/rdb_i_s.cc
+2
-2
No files found.
storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
View file @
d0fd44fc
...
...
@@ -81,3 +81,4 @@ ROCKSDB_DDL Beta
ROCKSDB_INDEX_FILE_MAP Beta
ROCKSDB_LOCKS Beta
ROCKSDB_TRX Beta
ROCKSDB_DEADLOCK Beta
storage/rocksdb/rdb_i_s.cc
View file @
d0fd44fc
...
...
@@ -1775,7 +1775,7 @@ struct st_maria_plugin rdb_i_s_trx_info = {
MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
};
struct
st_m
ysql
_plugin
rdb_i_s_deadlock_info
=
{
struct
st_m
aria
_plugin
rdb_i_s_deadlock_info
=
{
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
&
rdb_i_s_info
,
"ROCKSDB_DEADLOCK"
,
...
...
@@ -1788,6 +1788,6 @@ struct st_mysql_plugin rdb_i_s_deadlock_info = {
nullptr
,
/* status variables */
nullptr
,
/* system variables */
nullptr
,
/* config options */
0
,
/* flags */
MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
};
}
// namespace myrocks
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