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
97eddaaf
Commit
97eddaaf
authored
Apr 12, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 sql/item.cc: Auto merged
parents
19e4b52a
70454de2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
sql/field.h
sql/field.h
+1
-0
sql/item.cc
sql/item.cc
+1
-3
sql/item.h
sql/item.h
+1
-0
No files found.
sql/field.h
View file @
97eddaaf
...
...
@@ -92,6 +92,7 @@ class Field
utype
unireg_check_arg
,
const
char
*
field_name_arg
,
struct
st_table
*
table_arg
);
virtual
~
Field
()
{}
/* Store functions returns 1 on overflow and -1 on fatal error */
virtual
int
store
(
const
char
*
to
,
uint
length
,
CHARSET_INFO
*
cs
)
=
0
;
virtual
int
store
(
double
nr
)
=
0
;
virtual
int
store
(
longlong
nr
)
=
0
;
...
...
sql/item.cc
View file @
97eddaaf
...
...
@@ -678,9 +678,7 @@ void Item_param::set_longdata(const char *str, ulong length)
int
Item_param
::
save_in_field
(
Field
*
field
,
bool
no_conversions
)
{
THD
*
thd
=
current_thd
;
DBUG_ASSERT
(
thd
->
command
==
COM_EXECUTE
);
DBUG_ASSERT
(
current_thd
->
command
==
COM_EXECUTE
);
if
(
null_value
)
return
(
int
)
set_field_to_null
(
field
);
...
...
sql/item.h
View file @
97eddaaf
...
...
@@ -146,6 +146,7 @@ class Item {
complete fix_fields() procedure.
*/
inline
void
quick_fix_field
()
{
fixed
=
1
;
}
/* Function returns 1 on overflow and -1 on fatal errors */
virtual
int
save_in_field
(
Field
*
field
,
bool
no_conversions
);
virtual
void
save_org_in_field
(
Field
*
field
)
{
(
void
)
save_in_field
(
field
,
1
);
}
...
...
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