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
5ec766db
Commit
5ec766db
authored
Aug 02, 2007
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug29838
parents
5008318e
0f9cae48
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
sql/sql_insert.cc
sql/sql_insert.cc
+8
-1
No files found.
sql/sql_insert.cc
View file @
5ec766db
...
@@ -426,7 +426,6 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
...
@@ -426,7 +426,6 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
client connection and the delayed thread.
client connection and the delayed thread.
*/
*/
if
(
specialflag
&
(
SPECIAL_NO_NEW_FUNC
|
SPECIAL_SAFE_MODE
)
||
if
(
specialflag
&
(
SPECIAL_NO_NEW_FUNC
|
SPECIAL_SAFE_MODE
)
||
thd
->
slave_thread
||
thd
->
variables
.
max_insert_delayed_threads
==
0
||
thd
->
variables
.
max_insert_delayed_threads
==
0
||
thd
->
prelocked_mode
||
thd
->
prelocked_mode
||
thd
->
lex
->
uses_stored_routines
())
thd
->
lex
->
uses_stored_routines
())
...
@@ -434,6 +433,14 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
...
@@ -434,6 +433,14 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
*
lock_type
=
TL_WRITE
;
*
lock_type
=
TL_WRITE
;
return
;
return
;
}
}
if
(
thd
->
slave_thread
)
{
/* Try concurrent insert */
*
lock_type
=
(
duplic
==
DUP_UPDATE
||
duplic
==
DUP_REPLACE
)
?
TL_WRITE
:
TL_WRITE_CONCURRENT_INSERT
;
return
;
}
bool
log_on
=
(
thd
->
options
&
OPTION_BIN_LOG
||
bool
log_on
=
(
thd
->
options
&
OPTION_BIN_LOG
||
!
(
thd
->
security_ctx
->
master_access
&
SUPER_ACL
));
!
(
thd
->
security_ctx
->
master_access
&
SUPER_ACL
));
if
(
global_system_variables
.
binlog_format
==
BINLOG_FORMAT_STMT
&&
if
(
global_system_variables
.
binlog_format
==
BINLOG_FORMAT_STMT
&&
...
...
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