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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
2fae1b57
Commit
2fae1b57
authored
Sep 08, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prefer to use new flag name when possible
parent
ab34aecf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
sql/records.cc
sql/records.cc
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+2
-2
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+1
-1
storage/sphinx/ha_sphinx.h
storage/sphinx/ha_sphinx.h
+1
-1
No files found.
sql/records.cc
View file @
2fae1b57
...
...
@@ -288,7 +288,7 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
}
/* Condition pushdown to storage engine */
if
((
table
->
file
->
ha_table_flags
()
&
HA_
MUST_USE
_TABLE_CONDITION_PUSHDOWN
)
&&
HA_
CAN
_TABLE_CONDITION_PUSHDOWN
)
&&
select
&&
select
->
cond
&&
(
select
->
cond
->
used_tables
()
&
table
->
map
)
&&
!
table
->
file
->
pushed_cond
)
...
...
sql/sql_select.cc
View file @
2fae1b57
...
...
@@ -9570,7 +9570,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
{
tab
->
table
->
file
->
pushed_cond
=
NULL
;
if
((
tab
->
table
->
file
->
ha_table_flags
()
&
HA_
MUST_USE
_TABLE_CONDITION_PUSHDOWN
)
&&
HA_
CAN
_TABLE_CONDITION_PUSHDOWN
)
&&
!
first_inner_tab
)
{
COND
*
push_cond
=
...
...
@@ -23630,7 +23630,7 @@ void JOIN_TAB::save_explain_data(Explain_table_access *eta, table_map prefix_tab
const
COND
*
pushed_cond
=
tab
->
table
->
file
->
pushed_cond
;
if
((
tab
->
table
->
file
->
ha_table_flags
()
&
HA_
MUST_USE
_TABLE_CONDITION_PUSHDOWN
)
&&
HA_
CAN
_TABLE_CONDITION_PUSHDOWN
)
&&
pushed_cond
)
{
eta
->
push_extra
(
ET_USING_WHERE_WITH_PUSHED_CONDITION
);
...
...
storage/connect/ha_connect.cc
View file @
2fae1b57
...
...
@@ -690,7 +690,7 @@ ulonglong ha_connect::table_flags() const
// HA_NULL_IN_KEY | not implemented yet
// HA_FAST_KEY_READ | causes error when sorting (???)
HA_NO_TRANSACTIONS
|
HA_DUPLICATE_KEY_NOT_IN_ORDER
|
HA_NO_BLOBS
|
HA_
MUST_USE
_TABLE_CONDITION_PUSHDOWN
;
HA_NO_BLOBS
|
HA_
CAN
_TABLE_CONDITION_PUSHDOWN
;
ha_connect
*
hp
=
(
ha_connect
*
)
this
;
PTOS
pos
=
hp
->
GetTableOptionStruct
();
...
...
storage/sphinx/ha_sphinx.h
View file @
2fae1b57
...
...
@@ -60,7 +60,7 @@ public:
#if MYSQL_VERSION_ID>50100
ulonglong
table_flags
()
const
{
return
HA_CAN_INDEX_BLOBS
|
HA_
MUST_USE
_TABLE_CONDITION_PUSHDOWN
;
}
///< bitmap of implemented flags (see handler.h for more info)
HA_
CAN
_TABLE_CONDITION_PUSHDOWN
;
}
///< bitmap of implemented flags (see handler.h for more info)
#else
ulong
table_flags
()
const
{
return
HA_CAN_INDEX_BLOBS
;
}
///< bitmap of implemented flags (see handler.h for more info)
#endif
...
...
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