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
db9398ba
Commit
db9398ba
authored
Mar 15, 2021
by
Monty
Committed by
Sergei Golubchik
May 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved code comment and removed nop test
parent
08bc062e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
sql/sql_join_cache.h
sql/sql_join_cache.h
+5
-2
sql/sql_select.h
sql/sql_select.h
+1
-1
sql/sql_table.cc
sql/sql_table.cc
+1
-3
storage/maria/ha_s3.cc
storage/maria/ha_s3.cc
+9
-1
No files found.
sql/sql_join_cache.h
View file @
db9398ba
...
@@ -206,11 +206,14 @@ class JOIN_CACHE :public Sql_alloc
...
@@ -206,11 +206,14 @@ class JOIN_CACHE :public Sql_alloc
/*
/*
This flag indicates that records written into the join buffer contain
This flag indicates that records written into the join buffer contain
a match flag field. The flag must be set by the init method.
a match flag field.
This is set to true for the first inner table of an outer join or a
semi-join.
The flag must be set by the init method.
Currently any implementation of the virtial init method calls
Currently any implementation of the virtial init method calls
the function JOIN_CACHE::calc_record_fields() to set this flag.
the function JOIN_CACHE::calc_record_fields() to set this flag.
*/
*/
bool
with_match_flag
;
bool
with_match_flag
;
/*
/*
This flag indicates that any record is prepended with the length of the
This flag indicates that any record is prepended with the length of the
record which allows us to skip the record or part of it without reading.
record which allows us to skip the record or part of it without reading.
...
...
sql/sql_select.h
View file @
db9398ba
...
@@ -566,7 +566,7 @@ typedef struct st_join_table {
...
@@ -566,7 +566,7 @@ typedef struct st_join_table {
}
}
bool
is_first_inner_for_outer_join
()
bool
is_first_inner_for_outer_join
()
{
{
return
first_inner
&&
first_inner
==
this
;
return
first_inner
==
this
;
}
}
bool
use_match_flag
()
bool
use_match_flag
()
{
{
...
...
sql/sql_table.cc
View file @
db9398ba
...
@@ -6899,10 +6899,8 @@ static bool mysql_inplace_alter_table(THD *thd,
...
@@ -6899,10 +6899,8 @@ static bool mysql_inplace_alter_table(THD *thd,
Alter_info
*
alter_info
=
ha_alter_info
->
alter_info
;
Alter_info
*
alter_info
=
ha_alter_info
->
alter_info
;
bool
reopen_tables
=
false
;
bool
reopen_tables
=
false
;
bool
res
;
bool
res
;
const
enum_alter_inplace_result
inplace_supported
=
const
enum_alter_inplace_result
inplace_supported
=
ha_alter_info
->
inplace_supported
;
ha_alter_info
->
inplace_supported
;
DBUG_ENTER
(
"mysql_inplace_alter_table"
);
DBUG_ENTER
(
"mysql_inplace_alter_table"
);
/* Downgrade DDL lock while we are waiting for exclusive lock below */
/* Downgrade DDL lock while we are waiting for exclusive lock below */
...
@@ -7152,7 +7150,7 @@ static bool mysql_inplace_alter_table(THD *thd,
...
@@ -7152,7 +7150,7 @@ static bool mysql_inplace_alter_table(THD *thd,
DBUG_RETURN
(
true
);
DBUG_RETURN
(
true
);
}
}
// Rename altered table i
f requested.
// Rename altered table i
n case of ALTER TABLE ... RENAME
if
(
alter_ctx
->
is_table_renamed
())
if
(
alter_ctx
->
is_table_renamed
())
{
{
DBUG_ASSERT
(
!
tdc_share_is_cached
(
thd
,
alter_ctx
->
db
.
str
,
DBUG_ASSERT
(
!
tdc_share_is_cached
(
thd
,
alter_ctx
->
db
.
str
,
...
...
storage/maria/ha_s3.cc
View file @
db9398ba
...
@@ -736,7 +736,15 @@ static int s3_hton_panic(handlerton *hton, ha_panic_function flag)
...
@@ -736,7 +736,15 @@ static int s3_hton_panic(handlerton *hton, ha_panic_function flag)
/**
/**
Check if a table is in S3 as part of discovery
Check if a table is in S3 as part of discovery. Returns TABLE_SHARE if found.
@param hton S3 handlerton
@param thd MariaDB thd
@param [out] share If table exists, this is updated to contain the found
TABLE_SHARE (based on the .frm in S3)
@return 0 Table exists
@return # Error number
*/
*/
static
int
s3_discover_table
(
handlerton
*
hton
,
THD
*
thd
,
TABLE_SHARE
*
share
)
static
int
s3_discover_table
(
handlerton
*
hton
,
THD
*
thd
,
TABLE_SHARE
*
share
)
...
...
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