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
d1637b2e
Commit
d1637b2e
authored
Dec 20, 2007
by
tnurnberg@white.intern.koehntopp.de
Browse files
Options
Browse Files
Download
Plain Diff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31990/50-31990
parents
0004b99b
3f0f2750
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
mysql-test/r/type_date.result
mysql-test/r/type_date.result
+5
-0
mysql-test/t/type_date.test
mysql-test/t/type_date.test
+8
-0
sql/field.cc
sql/field.cc
+7
-0
sql/field.h
sql/field.h
+1
-0
No files found.
mysql-test/r/type_date.result
View file @
d1637b2e
...
@@ -251,4 +251,9 @@ INSERT INTO t1 VALUES ('1000-00-00');
...
@@ -251,4 +251,9 @@ INSERT INTO t1 VALUES ('1000-00-00');
ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
SET SQL_MODE=DEFAULT;
SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2;
DROP TABLE t1,t2;
CREATE TABLE t1 SELECT curdate() AS f1;
SELECT hour(f1), minute(f1), second(f1) FROM t1;
hour(f1) minute(f1) second(f1)
0 0 0
DROP TABLE t1;
End of 5.0 tests
End of 5.0 tests
mysql-test/t/type_date.test
View file @
d1637b2e
...
@@ -210,4 +210,12 @@ INSERT INTO t1 VALUES ('1000-00-00');
...
@@ -210,4 +210,12 @@ INSERT INTO t1 VALUES ('1000-00-00');
SET
SQL_MODE
=
DEFAULT
;
SET
SQL_MODE
=
DEFAULT
;
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
#
# Bug #31990: MINUTE() and SECOND() return bogus results when used on a DATE
#
CREATE
TABLE
t1
SELECT
curdate
()
AS
f1
;
SELECT
hour
(
f1
),
minute
(
f1
),
second
(
f1
)
FROM
t1
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql/field.cc
View file @
d1637b2e
...
@@ -5195,6 +5195,13 @@ String *Field_date::val_str(String *val_buffer,
...
@@ -5195,6 +5195,13 @@ String *Field_date::val_str(String *val_buffer,
}
}
bool
Field_date
::
get_time
(
MYSQL_TIME
*
ltime
)
{
bzero
((
char
*
)
ltime
,
sizeof
(
MYSQL_TIME
));
return
0
;
}
int
Field_date
::
cmp
(
const
char
*
a_ptr
,
const
char
*
b_ptr
)
int
Field_date
::
cmp
(
const
char
*
a_ptr
,
const
char
*
b_ptr
)
{
{
int32
a
,
b
;
int32
a
,
b
;
...
...
sql/field.h
View file @
d1637b2e
...
@@ -944,6 +944,7 @@ class Field_date :public Field_str {
...
@@ -944,6 +944,7 @@ class Field_date :public Field_str {
double
val_real
(
void
);
double
val_real
(
void
);
longlong
val_int
(
void
);
longlong
val_int
(
void
);
String
*
val_str
(
String
*
,
String
*
);
String
*
val_str
(
String
*
,
String
*
);
bool
get_time
(
MYSQL_TIME
*
ltime
);
bool
send_binary
(
Protocol
*
protocol
);
bool
send_binary
(
Protocol
*
protocol
);
int
cmp
(
const
char
*
,
const
char
*
);
int
cmp
(
const
char
*
,
const
char
*
);
void
sort_string
(
char
*
buff
,
uint
length
);
void
sort_string
(
char
*
buff
,
uint
length
);
...
...
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