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
030f0913
Commit
030f0913
authored
Jun 21, 2004
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Field_geom should have same max_length as Field_blob
Updated tests After merge fix
parent
d69a36d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+2
-0
sql/field.cc
sql/field.cc
+5
-2
sql/field.h
sql/field.h
+0
-1
No files found.
mysql-test/r/func_time.result
View file @
030f0913
...
@@ -533,6 +533,8 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
...
@@ -533,6 +533,8 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
select date_add(time,INTERVAL 1 SECOND) from t1;
select date_add(time,INTERVAL 1 SECOND) from t1;
date_add(time,INTERVAL 1 SECOND)
date_add(time,INTERVAL 1 SECOND)
NULL
NULL
Warnings:
Warning 1264 Data truncated; out of range for column 'time' at row 1
drop table t1;
drop table t1;
select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2,
select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2,
last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,
last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,
...
...
sql/field.cc
View file @
030f0913
...
@@ -3380,7 +3380,10 @@ bool Field_time::get_date(TIME *ltime, uint fuzzydate)
...
@@ -3380,7 +3380,10 @@ bool Field_time::get_date(TIME *ltime, uint fuzzydate)
long
tmp
;
long
tmp
;
if
(
!
fuzzydate
)
if
(
!
fuzzydate
)
{
{
set_warning
(
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_WARN_DATA_OUT_OF_RANGE
);
push_warning_printf
(
table
->
in_use
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_WARN_DATA_OUT_OF_RANGE
,
ER
(
ER_WARN_DATA_OUT_OF_RANGE
),
field_name
,
table
->
in_use
->
row_count
);
return
1
;
return
1
;
}
}
tmp
=
(
long
)
sint3korr
(
ptr
);
tmp
=
(
long
)
sint3korr
(
ptr
);
...
@@ -5984,7 +5987,7 @@ uint32 Field_blob::max_length()
...
@@ -5984,7 +5987,7 @@ uint32 Field_blob::max_length()
case
3
:
case
3
:
return
16777215
;
return
16777215
;
case
4
:
case
4
:
return
(
uint32
)
4294967295
;
return
(
uint32
)
4294967295U
;
default:
default:
DBUG_ASSERT
(
0
);
// we should never go here
DBUG_ASSERT
(
0
);
// we should never go here
return
0
;
return
0
;
...
...
sql/field.h
View file @
030f0913
...
@@ -1089,7 +1089,6 @@ class Field_geom :public Field_blob {
...
@@ -1089,7 +1089,6 @@ class Field_geom :public Field_blob {
void
get_key_image
(
char
*
buff
,
uint
length
,
CHARSET_INFO
*
cs
,
imagetype
type
);
void
get_key_image
(
char
*
buff
,
uint
length
,
CHARSET_INFO
*
cs
,
imagetype
type
);
void
set_key_image
(
char
*
buff
,
uint
length
,
CHARSET_INFO
*
cs
);
void
set_key_image
(
char
*
buff
,
uint
length
,
CHARSET_INFO
*
cs
);
uint32
max_length
()
{
return
field_length
;
}
field_cast_enum
field_cast_type
()
{
return
FIELD_CAST_GEOM
;
}
field_cast_enum
field_cast_type
()
{
return
FIELD_CAST_GEOM
;
}
};
};
#endif
/*HAVE_SPATIAL*/
#endif
/*HAVE_SPATIAL*/
...
...
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