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
9762c5d7
Commit
9762c5d7
authored
Feb 03, 2004
by
vva@eagle.mysql.r18.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
parents
d4d09768
45b85c10
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
sql/sql_insert.cc
sql/sql_insert.cc
+2
-1
No files found.
sql/sql_insert.cc
View file @
9762c5d7
...
@@ -198,7 +198,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
...
@@ -198,7 +198,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
if
(
duplic
==
DUP_UPDATE
&&
!
table
->
insert_values
)
if
(
duplic
==
DUP_UPDATE
&&
!
table
->
insert_values
)
{
{
/* it should be allocated before Item::fix_fields() */
/* it should be allocated before Item::fix_fields() */
table
->
insert_values
=
(
byte
*
)
alloc_root
(
&
table
->
mem_root
,
table
->
rec_buff_length
);
table
->
insert_values
=
(
byte
*
)
alloc_root
(
&
thd
->
mem_root
,
table
->
rec_buff_length
);
if
(
!
table
->
insert_values
)
if
(
!
table
->
insert_values
)
goto
abort
;
goto
abort
;
}
}
...
...
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