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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c3c14a06
Commit
c3c14a06
authored
12 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another fix for --innodb-trx* name conflict
parent
e3e2b4e1
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
mysql-test/suite/innodb/disabled.def
mysql-test/suite/innodb/disabled.def
+2
-0
mysql-test/suite/sys_vars/disabled.def
mysql-test/suite/sys_vars/disabled.def
+3
-0
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+2
-2
No files found.
mysql-test/suite/innodb/disabled.def
View file @
c3c14a06
...
@@ -9,3 +9,5 @@
...
@@ -9,3 +9,5 @@
# Do not use any TAB characters for whitespace.
# Do not use any TAB characters for whitespace.
#
#
##############################################################################
##############################################################################
innodb_bug12400341: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB
This diff is collapsed.
Click to expand it.
mysql-test/suite/sys_vars/disabled.def
View file @
c3c14a06
...
@@ -9,3 +9,6 @@
...
@@ -9,3 +9,6 @@
# Do not use any TAB characters for whitespace.
# Do not use any TAB characters for whitespace.
#
#
##############################################################################
##############################################################################
innodb_trx_rseg_n_slots_debug_basic: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB
This diff is collapsed.
Click to expand it.
storage/innobase/handler/ha_innodb.cc
View file @
c3c14a06
...
@@ -11647,14 +11647,13 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
...
@@ -11647,14 +11647,13 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR
(
purge_threads
),
MYSQL_SYSVAR
(
purge_threads
),
MYSQL_SYSVAR
(
purge_batch_size
),
MYSQL_SYSVAR
(
purge_batch_size
),
MYSQL_SYSVAR
(
rollback_segments
),
MYSQL_SYSVAR
(
rollback_segments
),
#ifdef UNIV_DEBUG
#ifdef UNIV_DEBUG
_never
/* disable this flag. --innodb-trx becomes ambiguous */
MYSQL_SYSVAR
(
trx_rseg_n_slots_debug
),
MYSQL_SYSVAR
(
trx_rseg_n_slots_debug
),
#endif
/* UNIV_DEBUG */
#endif
/* UNIV_DEBUG */
NULL
NULL
};
};
mysql_declare_plugin
(
innobase
)
mysql_declare_plugin
(
innobase
)
i_s_innodb_trx
,
// this need to be before SE plugin, otherwise --innodb-trx-rseg-n-slots-debug shadows --innodb-trx option
{
{
MYSQL_STORAGE_ENGINE_PLUGIN
,
MYSQL_STORAGE_ENGINE_PLUGIN
,
&
innobase_storage_engine
,
&
innobase_storage_engine
,
...
@@ -11670,6 +11669,7 @@ i_s_innodb_trx, // this need to be before SE plugin, otherwise --innodb-trx-rseg
...
@@ -11670,6 +11669,7 @@ i_s_innodb_trx, // this need to be before SE plugin, otherwise --innodb-trx-rseg
NULL
,
/* reserved */
NULL
,
/* reserved */
0
,
/* flags */
0
,
/* flags */
},
},
i_s_innodb_trx
,
i_s_innodb_locks
,
i_s_innodb_locks
,
i_s_innodb_lock_waits
,
i_s_innodb_lock_waits
,
i_s_innodb_cmp
,
i_s_innodb_cmp
,
...
...
This diff is collapsed.
Click to expand it.
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