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
e7a01ed3
Commit
e7a01ed3
authored
Jun 25, 2004
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fixes
parent
b1d08ba2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
include/mysql.h
include/mysql.h
+0
-1
sql-common/client.c
sql-common/client.c
+4
-0
sql/opt_range.cc
sql/opt_range.cc
+3
-1
sql/sql_handler.cc
sql/sql_handler.cc
+1
-1
sql/sql_insert.cc
sql/sql_insert.cc
+4
-2
No files found.
include/mysql.h
View file @
e7a01ed3
...
...
@@ -302,7 +302,6 @@ typedef struct st_mysql_res {
#endif
typedef
struct
st_mysql_manager
{
NET
net
;
...
...
sql-common/client.c
View file @
e7a01ed3
...
...
@@ -39,6 +39,10 @@
#include "mysql.h"
/* Remove client convenience wrappers */
#undef max_allowed_packet
#undef net_buffer_length
#ifdef EMBEDDED_LIBRARY
#undef MYSQL_SERVER
...
...
sql/opt_range.cc
View file @
e7a01ed3
...
...
@@ -629,7 +629,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
if
(
!
records
)
records
++
;
/* purecov: inspected */
scan_time
=
(
double
)
records
/
TIME_FOR_COMPARE
+
1
;
read_time
=
(
double
)
head
->
file
->
scan_time
()
+
scan_time
+
1.
0
;
read_time
=
(
double
)
head
->
file
->
scan_time
()
+
scan_time
+
1.
1
;
if
(
head
->
force_index
)
scan_time
=
read_time
=
DBL_MAX
;
if
(
limit
<
records
)
...
...
@@ -749,6 +749,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
param
.
range_count
,
found_records
)
+
(
double
)
found_records
/
TIME_FOR_COMPARE
);
DBUG_PRINT
(
"info"
,(
"read_time: %g found_read_time: %g"
,
read_time
,
found_read_time
));
if
(
read_time
>
found_read_time
&&
found_records
!=
HA_POS_ERROR
)
{
read_time
=
found_read_time
;
...
...
sql/sql_handler.cc
View file @
e7a01ed3
...
...
@@ -108,7 +108,7 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables,
!
no_alias
,
dont_lock
,
&
was_flushed
);
if
(
*
table_ptr
)
{
(
*
ptr
)
->
file
->
ha_index_or_rnd_end
();
(
*
table_
ptr
)
->
file
->
ha_index_or_rnd_end
();
if
(
!
dont_lock
)
VOID
(
pthread_mutex_lock
(
&
LOCK_open
));
if
(
close_thread_table
(
thd
,
table_ptr
))
...
...
sql/sql_insert.cc
View file @
e7a01ed3
...
...
@@ -1219,8 +1219,10 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
di
->
status
=
0
;
if
(
!
di
->
stacked_inserts
&&
!
di
->
tables_in_use
&&
thd
->
lock
)
{
/* No one is doing a insert delayed;
Unlock it so that other threads can use it */
/*
No one is doing a insert delayed
Unlock table so that other threads can use it
*/
MYSQL_LOCK
*
lock
=
thd
->
lock
;
thd
->
lock
=
0
;
pthread_mutex_unlock
(
&
di
->
mutex
);
...
...
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