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
df88e7ce
Commit
df88e7ce
authored
Mar 11, 2020
by
Eugene Kosov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typedef-related warning and cleanup using namespace std
parent
b30446c8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
11 deletions
+9
-11
storage/innobase/btr/btr0defragment.cc
storage/innobase/btr/btr0defragment.cc
+3
-0
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.h
+2
-2
storage/innobase/include/page0types.h
storage/innobase/include/page0types.h
+1
-3
storage/innobase/page/page0zip.cc
storage/innobase/page/page0zip.cc
+0
-3
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+1
-1
storage/xtradb/include/buf0buf.h
storage/xtradb/include/buf0buf.h
+2
-2
No files found.
storage/innobase/btr/btr0defragment.cc
View file @
df88e7ce
...
...
@@ -38,6 +38,9 @@ Modified 30/07/2014 Jan Lindström jan.lindstrom@mariadb.com
#include <list>
using
std
::
list
;
using
std
::
min
;
/* When there's no work, either because defragment is disabled, or because no
query is submitted, thread checks state every BTR_DEFRAGMENT_SLEEP_IN_USECS.*/
#define BTR_DEFRAGMENT_SLEEP_IN_USECS 1000000
...
...
storage/innobase/include/buf0buf.h
View file @
df88e7ce
...
...
@@ -1504,7 +1504,7 @@ buf_page_encrypt_before_write(
NOTE! The definition appears here only for other modules of this
directory (buf) to see it. Do not use from outside! */
typedef
struc
t
{
struct
buf_tmp_buffer_
t
{
private:
int32
reserved
;
/*!< true if this slot is reserved
*/
...
...
@@ -1534,7 +1534,7 @@ typedef struct {
return
!
my_atomic_fas32_explicit
(
&
reserved
,
true
,
MY_MEMORY_ORDER_RELAXED
);
}
}
buf_tmp_buffer_t
;
};
/** The common buffer control block structure
for compressed and uncompressed frames */
...
...
storage/innobase/include/page0types.h
View file @
df88e7ce
...
...
@@ -26,8 +26,6 @@ Created 2/2/1994 Heikki Tuuri
#ifndef page0types_h
#define page0types_h
using
namespace
std
;
#include <map>
#include "univ.i"
...
...
@@ -110,7 +108,7 @@ struct page_zip_stat_t {
};
/** Compression statistics types */
typedef
map
<
index_id_t
,
page_zip_stat_t
>
page_zip_stat_per_index_t
;
typedef
std
::
map
<
index_id_t
,
page_zip_stat_t
>
page_zip_stat_per_index_t
;
/** Statistics on compression, indexed by page_zip_des_t::ssize - 1 */
extern
page_zip_stat_t
page_zip_stat
[
PAGE_ZIP_SSIZE_MAX
];
...
...
storage/innobase/page/page0zip.cc
View file @
df88e7ce
...
...
@@ -28,9 +28,6 @@ Created June 2005 by Marko Makela
// First include (the generated) my_config.h, to get correct platform defines.
#include "my_config.h"
#include <map>
using
namespace
std
;
#define THIS_MODULE
#include "page0zip.h"
#ifdef UNIV_NONINL
...
...
storage/innobase/row/row0mysql.cc
View file @
df88e7ce
...
...
@@ -807,7 +807,7 @@ row_create_prebuilt(
temp_index
->
fields
[
i
].
fixed_len
;
}
}
srch_key_len
=
max
(
srch_key_len
,
temp_len
);
srch_key_len
=
std
::
max
(
srch_key_len
,
temp_len
);
}
ut_a
(
srch_key_len
<=
MAX_SRCH_KEY_VAL_BUFFER
);
...
...
storage/xtradb/include/buf0buf.h
View file @
df88e7ce
...
...
@@ -1528,7 +1528,7 @@ buf_page_encrypt_before_write(
NOTE! The definition appears here only for other modules of this
directory (buf) to see it. Do not use from outside! */
typedef
struc
t
{
struct
buf_tmp_buffer_
t
{
private:
int32
reserved
;
/*!< true if this slot is reserved
*/
...
...
@@ -1558,7 +1558,7 @@ typedef struct {
return
!
my_atomic_fas32_explicit
(
&
reserved
,
true
,
MY_MEMORY_ORDER_RELAXED
);
}
}
buf_tmp_buffer_t
;
};
/** The common buffer control block structure
for compressed and uncompressed frames */
...
...
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