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
d0f1b5f3
Commit
d0f1b5f3
authored
Feb 18, 2005
by
mats@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b7879-mysql-4.0
parents
4decbce5
625f7f0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
sql/sql_update.cc
sql/sql_update.cc
+4
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+2
-2
No files found.
sql/sql_update.cc
View file @
d0f1b5f3
...
@@ -473,7 +473,10 @@ int mysql_multi_update_lock(THD *thd,
...
@@ -473,7 +473,10 @@ int mysql_multi_update_lock(THD *thd,
else
else
{
{
DBUG_PRINT
(
"info"
,(
"setting table `%s` for read-only"
,
tl
->
alias
));
DBUG_PRINT
(
"info"
,(
"setting table `%s` for read-only"
,
tl
->
alias
));
tl
->
lock_type
=
TL_READ
;
// If we are using the binary log, we need TL_READ_NO_INSERT to get
// correct order of statements. Otherwise, we use a TL_READ lock to
// improve performance.
tl
->
lock_type
=
using_update_log
?
TL_READ_NO_INSERT
:
TL_READ
;
tl
->
updating
=
0
;
tl
->
updating
=
0
;
wants
=
SELECT_ACL
;
wants
=
SELECT_ACL
;
}
}
...
...
sql/sql_yacc.yy
View file @
d0f1b5f3
...
@@ -822,7 +822,7 @@ create_select:
...
@@ -822,7 +822,7 @@ create_select:
SELECT_SYM
SELECT_SYM
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->lock_option=
(using_update_log)
? TL_READ_NO_INSERT : TL_READ;
lex->lock_option=
using_update_log
? TL_READ_NO_INSERT : TL_READ;
if (lex->sql_command == SQLCOM_INSERT)
if (lex->sql_command == SQLCOM_INSERT)
lex->sql_command= SQLCOM_INSERT_SELECT;
lex->sql_command= SQLCOM_INSERT_SELECT;
else if (lex->sql_command == SQLCOM_REPLACE)
else if (lex->sql_command == SQLCOM_REPLACE)
...
@@ -1532,7 +1532,7 @@ select_part2:
...
@@ -1532,7 +1532,7 @@ select_part2:
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->lock_option=TL_READ;
lex->lock_option=TL_READ;
mysql_init_select(lex);
mysql_init_select(lex);
}
}
select_options select_item_list select_into select_lock_type;
select_options select_item_list select_into select_lock_type;
...
...
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