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
f5c52797
Commit
f5c52797
authored
Apr 09, 2006
by
aelkin@dl145k.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
parents
cbee6eca
61c7e4ba
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
sql/sql_cache.cc
sql/sql_cache.cc
+5
-0
sql/sql_class.cc
sql/sql_class.cc
+0
-4
sql/sql_cursor.cc
sql/sql_cursor.cc
+1
-2
No files found.
sql/sql_cache.cc
View file @
f5c52797
...
@@ -830,6 +830,11 @@ sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
...
@@ -830,6 +830,11 @@ sql mode: 0x%lx, sort len: %lu, conncat len: %lu",
flags
.
sql_mode
,
flags
.
sql_mode
,
flags
.
max_sort_length
,
flags
.
max_sort_length
,
flags
.
group_concat_max_len
));
flags
.
group_concat_max_len
));
/*
Make InnoDB to release the adaptive hash index latch before
acquiring the query cache mutex.
*/
ha_release_temporary_latches
(
thd
);
STRUCT_LOCK
(
&
structure_guard_mutex
);
STRUCT_LOCK
(
&
structure_guard_mutex
);
if
(
query_cache_size
==
0
)
if
(
query_cache_size
==
0
)
...
...
sql/sql_class.cc
View file @
f5c52797
...
@@ -919,14 +919,12 @@ bool select_send::send_data(List<Item> &items)
...
@@ -919,14 +919,12 @@ bool select_send::send_data(List<Item> &items)
return
0
;
return
0
;
}
}
#ifdef HAVE_INNOBASE_DB
/*
/*
We may be passing the control from mysqld to the client: release the
We may be passing the control from mysqld to the client: release the
InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
by thd
by thd
*/
*/
ha_release_temporary_latches
(
thd
);
ha_release_temporary_latches
(
thd
);
#endif
List_iterator_fast
<
Item
>
li
(
items
);
List_iterator_fast
<
Item
>
li
(
items
);
Protocol
*
protocol
=
thd
->
protocol
;
Protocol
*
protocol
=
thd
->
protocol
;
...
@@ -956,12 +954,10 @@ bool select_send::send_data(List<Item> &items)
...
@@ -956,12 +954,10 @@ bool select_send::send_data(List<Item> &items)
bool
select_send
::
send_eof
()
bool
select_send
::
send_eof
()
{
{
#ifdef HAVE_INNOBASE_DB
/* We may be passing the control from mysqld to the client: release the
/* We may be passing the control from mysqld to the client: release the
InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
by thd */
by thd */
ha_release_temporary_latches
(
thd
);
ha_release_temporary_latches
(
thd
);
#endif
/* Unlock tables before sending packet to gain some speed */
/* Unlock tables before sending packet to gain some speed */
if
(
thd
->
lock
)
if
(
thd
->
lock
)
...
...
sql/sql_cursor.cc
View file @
f5c52797
...
@@ -445,9 +445,8 @@ Sensitive_cursor::fetch(ulong num_rows)
...
@@ -445,9 +445,8 @@ Sensitive_cursor::fetch(ulong num_rows)
if
(
error
==
NESTED_LOOP_CURSOR_LIMIT
)
if
(
error
==
NESTED_LOOP_CURSOR_LIMIT
)
join
->
resume_nested_loop
=
TRUE
;
join
->
resume_nested_loop
=
TRUE
;
#ifdef USING_TRANSACTIONS
ha_release_temporary_latches
(
thd
);
ha_release_temporary_latches
(
thd
);
#endif
/* Grab free_list here to correctly free it in close */
/* Grab free_list here to correctly free it in close */
thd
->
restore_active_arena
(
this
,
&
backup_arena
);
thd
->
restore_active_arena
(
this
,
&
backup_arena
);
...
...
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