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
8d4c159b
Commit
8d4c159b
authored
Jun 25, 2019
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added s3_debug to be able to debug s3 connections
parent
e6297bbe
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
libmysqld/libmysql.c
libmysqld/libmysql.c
+4
-0
mysql-test/suite/s3/basic.result
mysql-test/suite/s3/basic.result
+1
-0
storage/maria/ha_s3.cc
storage/maria/ha_s3.cc
+9
-1
No files found.
libmysqld/libmysql.c
View file @
8d4c159b
...
@@ -5030,5 +5030,9 @@ uint8_t ms3_move(ms3_st *ms3, const char *source_bucket, const char *source_key,
...
@@ -5030,5 +5030,9 @@ uint8_t ms3_move(ms3_st *ms3, const char *source_bucket, const char *source_key,
return
1
;
return
1
;
}
}
void
ms3_debug
()
{
}
C_MODE_END
C_MODE_END
#endif
/* WITH_S3_STORAGE_ENGINE */
#endif
/* WITH_S3_STORAGE_ENGINE */
mysql-test/suite/s3/basic.result
View file @
8d4c159b
...
@@ -88,6 +88,7 @@ Variable_name Value
...
@@ -88,6 +88,7 @@ Variable_name Value
s3_access_key X
s3_access_key X
s3_block_size X
s3_block_size X
s3_bucket X
s3_bucket X
s3_debug X
s3_host_name X
s3_host_name X
s3_pagecache_age_threshold X
s3_pagecache_age_threshold X
s3_pagecache_buffer_size X
s3_pagecache_buffer_size X
...
...
storage/maria/ha_s3.cc
View file @
8d4c159b
...
@@ -78,6 +78,7 @@ static ulonglong s3_pagecache_buffer_size;
...
@@ -78,6 +78,7 @@ static ulonglong s3_pagecache_buffer_size;
static
char
*
s3_bucket
,
*
s3_access_key
=
0
,
*
s3_secret_key
=
0
,
*
s3_region
;
static
char
*
s3_bucket
,
*
s3_access_key
=
0
,
*
s3_secret_key
=
0
,
*
s3_region
;
static
char
*
s3_host_name
;
static
char
*
s3_host_name
;
static
char
*
s3_tmp_access_key
=
0
,
*
s3_tmp_secret_key
=
0
;
static
char
*
s3_tmp_access_key
=
0
,
*
s3_tmp_secret_key
=
0
;
static
my_bool
s3_debug
=
0
;
handlerton
*
s3_hton
=
0
;
handlerton
*
s3_hton
=
0
;
/* Don't show access or secret keys to users if they exists */
/* Don't show access or secret keys to users if they exists */
...
@@ -117,6 +118,11 @@ static MYSQL_SYSVAR_ULONG(block_size, s3_block_size,
...
@@ -117,6 +118,11 @@ static MYSQL_SYSVAR_ULONG(block_size, s3_block_size,
"Block size for S3"
,
0
,
0
,
"Block size for S3"
,
0
,
0
,
4
*
1024
*
1024
,
65536
,
16
*
1024
*
1024
,
8192
);
4
*
1024
*
1024
,
65536
,
16
*
1024
*
1024
,
8192
);
static
MYSQL_SYSVAR_BOOL
(
debug
,
s3_debug
,
PLUGIN_VAR_RQCMDARG
|
PLUGIN_VAR_READONLY
,
"Generates trace file from libmarias3 on stderr for debugging"
,
0
,
0
,
0
);
static
MYSQL_SYSVAR_ENUM
(
protocol_version
,
s3_protocol_version
,
static
MYSQL_SYSVAR_ENUM
(
protocol_version
,
s3_protocol_version
,
PLUGIN_VAR_RQCMDARG
,
PLUGIN_VAR_RQCMDARG
,
"Protocol used to communication with S3. One of "
"Protocol used to communication with S3. One of "
...
@@ -173,7 +179,6 @@ static MYSQL_SYSVAR_STR(region, s3_region,
...
@@ -173,7 +179,6 @@ static MYSQL_SYSVAR_STR(region, s3_region,
"AWS region"
,
"AWS region"
,
0
,
0
,
""
);
0
,
0
,
""
);
ha_create_table_option
s3_table_option_list
[]
=
ha_create_table_option
s3_table_option_list
[]
=
{
{
/*
/*
...
@@ -696,6 +701,8 @@ static int ha_s3_init(void *p)
...
@@ -696,6 +701,8 @@ static int ha_s3_init(void *p)
s3_pagecache
.
big_block_read
=
s3_block_read
;
s3_pagecache
.
big_block_read
=
s3_block_read
;
s3_pagecache
.
big_block_free
=
s3_free
;
s3_pagecache
.
big_block_free
=
s3_free
;
s3_init_library
();
s3_init_library
();
if
(
s3_debug
)
ms3_debug
();
return
res
?
HA_ERR_INITIALIZATION
:
0
;
return
res
?
HA_ERR_INITIALIZATION
:
0
;
}
}
...
@@ -716,6 +723,7 @@ static SHOW_VAR status_variables[]= {
...
@@ -716,6 +723,7 @@ static SHOW_VAR status_variables[]= {
static
struct
st_mysql_sys_var
*
system_variables
[]
=
{
static
struct
st_mysql_sys_var
*
system_variables
[]
=
{
MYSQL_SYSVAR
(
block_size
),
MYSQL_SYSVAR
(
block_size
),
MYSQL_SYSVAR
(
debug
),
MYSQL_SYSVAR
(
protocol_version
),
MYSQL_SYSVAR
(
protocol_version
),
MYSQL_SYSVAR
(
pagecache_age_threshold
),
MYSQL_SYSVAR
(
pagecache_age_threshold
),
MYSQL_SYSVAR
(
pagecache_buffer_size
),
MYSQL_SYSVAR
(
pagecache_buffer_size
),
...
...
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