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
11a920ab
Commit
11a920ab
authored
Jan 18, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
parents
6cac37a4
7c9ddb9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+5
-1
No files found.
sql/sql_yacc.yy
View file @
11a920ab
...
@@ -4008,7 +4008,8 @@ insert:
...
@@ -4008,7 +4008,8 @@ insert:
{
{
LEX *lex= Lex;
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSERT;
lex->sql_command= SQLCOM_INSERT;
lex->duplicates= DUP_ERROR;
lex->duplicates= DUP_ERROR;
mysql_init_select(lex);
/* for subselects */
/* for subselects */
lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ;
lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ;
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
...
@@ -4028,6 +4029,7 @@ replace:
...
@@ -4028,6 +4029,7 @@ replace:
LEX *lex=Lex;
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPLACE;
lex->sql_command = SQLCOM_REPLACE;
lex->duplicates= DUP_REPLACE;
lex->duplicates= DUP_REPLACE;
mysql_init_select(lex);
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
}
}
replace_lock_option insert2
replace_lock_option insert2
...
@@ -4229,6 +4231,7 @@ delete:
...
@@ -4229,6 +4231,7 @@ delete:
{
{
LEX *lex= Lex;
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
lex->sql_command= SQLCOM_DELETE;
mysql_init_select(lex);
lex->lock_option= lex->thd->update_lock_default;
lex->lock_option= lex->thd->update_lock_default;
lex->ignore= 0;
lex->ignore= 0;
lex->select_lex.init_order();
lex->select_lex.init_order();
...
@@ -5321,6 +5324,7 @@ set:
...
@@ -5321,6 +5324,7 @@ set:
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->sql_command= SQLCOM_SET_OPTION;
lex->sql_command= SQLCOM_SET_OPTION;
mysql_init_select(lex);
lex->option_type=OPT_SESSION;
lex->option_type=OPT_SESSION;
lex->var_list.empty();
lex->var_list.empty();
lex->one_shot_set= 0;
lex->one_shot_set= 0;
...
...
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