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
b075191b
Commit
b075191b
authored
Jan 06, 2023
by
Rex
Committed by
Daniel Black
Jan 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-30353 Debian additions version fix
fix up version detection in debian/additions/innotop after 10->11
parent
c6e0ab74
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
debian/additions/innotop/innotop
debian/additions/innotop/innotop
+3
-3
No files found.
debian/additions/innotop/innotop
View file @
b075191b
...
@@ -466,7 +466,7 @@ sub parse_status_text {
...
@@ -466,7 +466,7 @@ sub parse_status_text {
# too many locks to print, the output might be truncated)
# too many locks to print, the output might be truncated)
my $time_text;
my $time_text;
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10
|11
\.[0-9]\./) ) {
( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m;
( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m;
$innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
$innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
} else {
} else {
...
@@ -634,7 +634,7 @@ sub parse_fk_section {
...
@@ -634,7 +634,7 @@ sub parse_fk_section {
return 0 unless $fulltext;
return 0 unless $fulltext;
my ( $ts, $type );
my ( $ts, $type );
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[0-9]\./) ) {
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10
|11
.[0-9]\./) ) {
( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m;
( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m;
$section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
$section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
} else {
} else {
...
@@ -894,7 +894,7 @@ sub parse_dl_section {
...
@@ -894,7 +894,7 @@ sub parse_dl_section {
my ( $ts ) = $fulltext =~ m/^$s$/m;
my ( $ts ) = $fulltext =~ m/^$s$/m;
return 0 unless $ts;
return 0 unless $ts;
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10
|11
\.[0-9]\./) ) {
$dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
$dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
}
}
else {
else {
...
...
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