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
d50fe402
Commit
d50fe402
authored
Aug 15, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.2 into 10.3
parents
828191b6
112589cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
14 deletions
+15
-14
extra/innochecksum.cc
extra/innochecksum.cc
+3
-8
mysql-test/suite/galera/disabled.def
mysql-test/suite/galera/disabled.def
+1
-0
sql/item.h
sql/item.h
+1
-2
sql/sql_list.h
sql/sql_list.h
+9
-1
storage/innobase/row/row0sel.cc
storage/innobase/row/row0sel.cc
+1
-3
No files found.
extra/innochecksum.cc
View file @
d50fe402
...
...
@@ -1591,10 +1591,8 @@ int main(
byte
*
xdes
=
NULL
;
/* bytes read count */
ulint
bytes
;
/* current time */
time_t
now
;
/* last time */
time_t
lastt
;
time_t
lastt
=
0
;
/* stat, to get file size. */
#ifdef _WIN32
struct
_stat64
st
;
...
...
@@ -1945,7 +1943,6 @@ int main(
/* main checksumming loop */
cur_page_num
=
start_page
?
start_page
:
cur_page_num
+
1
;
lastt
=
0
;
while
(
!
feof
(
fil_in
))
{
bytes
=
read_file
(
buf
,
partial_page_read
,
...
...
@@ -2025,12 +2022,10 @@ int main(
if
(
verbose
&&
!
read_from_stdin
)
{
if
((
cur_page_num
%
64
)
==
0
)
{
now
=
time
(
0
);
time_t
now
=
time
(
0
);
if
(
!
lastt
)
{
lastt
=
now
;
}
if
(
now
-
lastt
>=
1
&&
is_log_enabled
)
{
}
else
if
(
now
-
lastt
>=
1
&&
is_log_enabled
)
{
fprintf
(
log_file
,
"page::%llu "
"okay: %.3f%% done
\n
"
,
(
cur_page_num
-
1
),
...
...
mysql-test/suite/galera/disabled.def
View file @
d50fe402
...
...
@@ -35,3 +35,4 @@ galera_var_slave_threads : MDEV-19746 Galera test failures because of wsrep_slav
galera_sst_mariabackup_encrypt_with_key : MDEV-19926 Galera SST tests fail
galera_wan : MDEV-17259: Test failure on galera.galera_wan
partition : MDEV-19958 Galera test failure on galera.partition
query_cache: MDEV-15805 Test failure on galera.query_cache
\ No newline at end of file
sql/item.h
View file @
d50fe402
...
...
@@ -2,7 +2,7 @@
#define SQL_ITEM_INCLUDED
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2009, 201
8, MariaDB Corporation
Copyright (c) 2009, 201
9, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
...
...
@@ -632,7 +632,6 @@ class String_copier_for_item: public String_copier
class
Item
:
public
Value_source
,
public
Type_all_attributes
{
void
operator
=
(
Item
&
);
/**
The index in the JOIN::join_tab array of the JOIN_TAB this Item is attached
to. Items are attached (or 'pushed') to JOIN_TABs during optimization by the
...
...
sql/sql_list.h
View file @
d50fe402
#ifndef INCLUDES_MYSQL_SQL_LIST_H
#define INCLUDES_MYSQL_SQL_LIST_H
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
...
...
@@ -48,6 +49,14 @@ class SQL_I_List :public Sql_alloc
next
=
elements
?
tmp
.
next
:
&
first
;
}
SQL_I_List
&
operator
=
(
const
SQL_I_List
&
tmp
)
{
elements
=
tmp
.
elements
;
first
=
tmp
.
first
;
next
=
tmp
.
next
;
return
*
this
;
}
inline
void
empty
()
{
elements
=
0
;
...
...
@@ -488,7 +497,6 @@ template <class T> class List :public base_list
{
public:
inline
List
()
:
base_list
()
{}
inline
List
(
const
List
<
T
>
&
tmp
)
:
base_list
(
tmp
)
{}
inline
List
(
const
List
<
T
>
&
tmp
,
MEM_ROOT
*
mem_root
)
:
base_list
(
tmp
,
mem_root
)
{}
inline
bool
push_back
(
T
*
a
)
{
return
base_list
::
push_back
(
a
);
}
...
...
storage/innobase/row/row0sel.cc
View file @
d50fe402
...
...
@@ -5654,9 +5654,7 @@ row_search_mvcc(
/*-------------------------------------------------------------*/
if
(
!
dict_index_is_spatial
(
index
))
{
if
(
rec
)
{
btr_pcur_store_position
(
pcur
,
&
mtr
);
}
btr_pcur_store_position
(
pcur
,
&
mtr
);
}
lock_table_wait:
...
...
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