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
ab49b46d
Commit
ab49b46d
authored
Jun 19, 2024
by
Yuchen Pei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-27664 remove SPIDER_SQL_CACHE_IS_IN_LEX
sql_cache was moved to lex in MDEV-11953 in
de745ecf
parent
a1e5ee91
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
18 deletions
+0
-18
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+0
-4
storage/spider/spd_db_mysql.cc
storage/spider/spd_db_mysql.cc
+0
-13
storage/spider/spd_environ.h
storage/spider/spd_environ.h
+0
-1
No files found.
storage/spider/ha_spider.cc
View file @
ab49b46d
...
...
@@ -12506,11 +12506,7 @@ void ha_spider::check_pre_call(
)
||
(
(
skip_parallel_search
&
2
)
&&
#ifdef SPIDER_SQL_CACHE_IS_IN_LEX
lex
->
sql_cache
==
LEX
::
SQL_NO_CACHE
// for mysqldump
#else
select_lex
&&
select_lex
->
sql_cache
==
SELECT_LEX
::
SQL_NO_CACHE
// for mysqldump
#endif
)
)
{
use_pre_call
=
FALSE
;
...
...
storage/spider/spd_db_mysql.cc
View file @
ab49b46d
...
...
@@ -9450,29 +9450,16 @@ int spider_mbase_handler::append_select(
wide_handler
->
lock_mode
<
1
)
{
/* no lock */
#ifdef SPIDER_SQL_CACHE_IS_IN_LEX
LEX
*
lex
=
wide_handler
->
trx
->
thd
->
lex
;
#else
st_select_lex
*
select_lex
=
&
wide_handler
->
trx
->
thd
->
lex
->
select_lex
;
#endif
if
(
#ifdef SPIDER_SQL_CACHE_IS_IN_LEX
lex
->
sql_cache
==
LEX
::
SQL_CACHE
&&
#else
select_lex
->
sql_cache
==
SELECT_LEX
::
SQL_CACHE
&&
#endif
(
spider
->
share
->
query_cache_sync
&
1
)
)
{
if
(
str
->
reserve
(
SPIDER_SQL_SQL_CACHE_LEN
))
DBUG_RETURN
(
HA_ERR_OUT_OF_MEM
);
str
->
q_append
(
SPIDER_SQL_SQL_CACHE_STR
,
SPIDER_SQL_SQL_CACHE_LEN
);
}
else
if
(
#ifdef SPIDER_SQL_CACHE_IS_IN_LEX
lex
->
sql_cache
==
LEX
::
SQL_NO_CACHE
&&
#else
select_lex
->
sql_cache
==
SELECT_LEX
::
SQL_NO_CACHE
&&
#endif
(
spider
->
share
->
query_cache_sync
&
2
)
)
{
if
(
str
->
reserve
(
SPIDER_SQL_SQL_NO_CACHE_LEN
))
...
...
storage/spider/spd_environ.h
View file @
ab49b46d
...
...
@@ -24,7 +24,6 @@
#define HANDLER_HAS_DIRECT_AGGREGATE
#define SPIDER_SQL_CACHE_IS_IN_LEX
#define SPIDER_LIKE_FUNC_HAS_GET_NEGATED
#define HA_HAS_CHECKSUM_EXTENDED
...
...
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