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
aa9c7a67
Commit
aa9c7a67
authored
20 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
ca74ce33
735d25ed
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
31 deletions
+8
-31
sql/sql_insert.cc
sql/sql_insert.cc
+4
-5
sql/sql_prepare.cc
sql/sql_prepare.cc
+4
-26
No files found.
sql/sql_insert.cc
View file @
aa9c7a67
...
...
@@ -427,6 +427,7 @@ abort:
thd - thread handler
table_list - global table list
insert_table_list - local table list of INSERT SELECT_LEX
values - values to insert. NULL for INSERT ... SELECT
RETURN VALUE
0 - OK
...
...
@@ -442,7 +443,7 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
if
(
duplic
==
DUP_UPDATE
&&
!
table
->
insert_values
)
{
/* it should be allocated before Item::fix_fields() */
table
->
insert_values
=
table
->
insert_values
=
(
byte
*
)
alloc_root
(
thd
->
mem_root
,
table
->
rec_buff_length
);
if
(
!
table
->
insert_values
)
DBUG_RETURN
(
-
1
);
...
...
@@ -454,10 +455,8 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
(
setup_fields
(
thd
,
0
,
insert_table_list
,
update_fields
,
1
,
0
,
0
)
||
setup_fields
(
thd
,
0
,
insert_table_list
,
update_values
,
1
,
0
,
0
))))
DBUG_RETURN
(
-
1
);
if
((
thd
->
lex
->
sql_command
==
SQLCOM_INSERT
||
thd
->
lex
->
sql_command
==
SQLCOM_REPLACE
)
&&
find_real_table_in_list
(
table_list
->
next
,
table_list
->
db
,
table_list
->
real_name
))
if
(
values
&&
find_real_table_in_list
(
table_list
->
next
,
table_list
->
db
,
table_list
->
real_name
))
{
my_error
(
ER_UPDATE_TABLE_USED
,
MYF
(
0
),
table_list
->
real_name
);
DBUG_RETURN
(
-
1
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_prepare.cc
View file @
aa9c7a67
...
...
@@ -908,14 +908,15 @@ static int mysql_test_insert(Prepared_statement *stmt,
uint
value_count
;
ulong
counter
=
0
;
table_list
->
table
->
insert_values
=
(
byte
*
)
1
;
// don't allocate insert_values
if
((
res
=
mysql_prepare_insert
(
thd
,
table_list
,
insert_table_list
,
table_list
->
table
,
fields
,
values
,
update_fields
,
update_values
,
duplic
)))
goto
error
;
value_count
=
values
->
elements
;
its
.
rewind
();
while
((
values
=
its
++
))
{
counter
++
;
...
...
@@ -934,6 +935,7 @@ static int mysql_test_insert(Prepared_statement *stmt,
res
=
0
;
error:
lex
->
unit
.
cleanup
();
table_list
->
table
->
insert_values
=
0
;
DBUG_RETURN
(
res
);
}
...
...
@@ -1513,28 +1515,6 @@ static bool init_param_array(Prepared_statement *stmt)
return
0
;
}
/* Init statement before execution */
static
void
cleanup_stmt_for_execute
(
Prepared_statement
*
stmt
)
{
THD
*
thd
=
stmt
->
thd
;
LEX
*
lex
=
stmt
->
lex
;
SELECT_LEX
*
sl
=
lex
->
all_selects_list
;
for
(;
sl
;
sl
=
sl
->
next_select_in_list
())
{
for
(
TABLE_LIST
*
tables
=
(
TABLE_LIST
*
)
sl
->
table_list
.
first
;
tables
;
tables
=
tables
->
next
)
{
if
(
tables
->
table
)
tables
->
table
->
insert_values
=
0
;
}
}
}
/*
Given a query string with parameter markers, create a Prepared Statement
from it and send PS info back to the client.
...
...
@@ -1635,7 +1615,6 @@ int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length,
if
(
!
error
)
error
=
send_prepare_results
(
stmt
,
test
(
name
));
cleanup_stmt_for_execute
(
stmt
);
/* restore to WAIT_PRIOR: QUERY_PRIOR is set inside alloc_query */
if
(
!
(
specialflag
&
SPECIAL_NO_PRIOR
))
...
...
@@ -1926,7 +1905,6 @@ static void execute_stmt(THD *thd, Prepared_statement *stmt,
reset_stmt_params
(
stmt
);
close_thread_tables
(
thd
);
// to close derived tables
thd
->
set_statement
(
&
thd
->
stmt_backup
);
cleanup_stmt_for_execute
(
stmt
);
DBUG_VOID_RETURN
;
}
...
...
This diff is collapsed.
Click to expand it.
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