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
ce84ba2f
Commit
ce84ba2f
authored
Jun 02, 2014
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6287 Bad warning level when inserting a DATETIME value into a TIME column
parent
4211b1cd
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
27 deletions
+27
-27
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_2myisam.result
+4
-4
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_3innodb.result
+4
-4
mysql-test/r/ps_4heap.result
mysql-test/r/ps_4heap.result
+4
-4
mysql-test/r/ps_5merge.result
mysql-test/r/ps_5merge.result
+8
-8
mysql-test/r/type_time_hires.result
mysql-test/r/type_time_hires.result
+2
-2
mysql-test/suite/maria/ps_maria.result
mysql-test/suite/maria/ps_maria.result
+4
-4
sql-common/my_time.c
sql-common/my_time.c
+1
-1
No files found.
mysql-test/r/ps_2myisam.result
View file @
ce84ba2f
...
@@ -3256,7 +3256,7 @@ values
...
@@ -3256,7 +3256,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3264,7 +3264,7 @@ values
...
@@ -3264,7 +3264,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3273,7 +3273,7 @@ values
...
@@ -3273,7 +3273,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3282,7 +3282,7 @@ values
...
@@ -3282,7 +3282,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
...
mysql-test/r/ps_3innodb.result
View file @
ce84ba2f
...
@@ -3239,7 +3239,7 @@ values
...
@@ -3239,7 +3239,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3247,7 +3247,7 @@ values
...
@@ -3247,7 +3247,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3256,7 +3256,7 @@ values
...
@@ -3256,7 +3256,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3265,7 +3265,7 @@ values
...
@@ -3265,7 +3265,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
...
mysql-test/r/ps_4heap.result
View file @
ce84ba2f
...
@@ -3240,7 +3240,7 @@ values
...
@@ -3240,7 +3240,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3248,7 +3248,7 @@ values
...
@@ -3248,7 +3248,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3257,7 +3257,7 @@ values
...
@@ -3257,7 +3257,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3266,7 +3266,7 @@ values
...
@@ -3266,7 +3266,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
...
mysql-test/r/ps_5merge.result
View file @
ce84ba2f
...
@@ -3176,7 +3176,7 @@ values
...
@@ -3176,7 +3176,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3184,7 +3184,7 @@ values
...
@@ -3184,7 +3184,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3193,7 +3193,7 @@ values
...
@@ -3193,7 +3193,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3202,7 +3202,7 @@ values
...
@@ -3202,7 +3202,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
@@ -6530,7 +6530,7 @@ values
...
@@ -6530,7 +6530,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -6538,7 +6538,7 @@ values
...
@@ -6538,7 +6538,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -6547,7 +6547,7 @@ values
...
@@ -6547,7 +6547,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -6556,7 +6556,7 @@ values
...
@@ -6556,7 +6556,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
...
mysql-test/r/type_time_hires.result
View file @
ce84ba2f
...
@@ -11,10 +11,10 @@ Warnings:
...
@@ -11,10 +11,10 @@ Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 1
insert t1 values (20101211010203.45678);
insert t1 values (20101211010203.45678);
Warnings:
Warnings:
Warning
1265 Data truncated for column 'a' at row 1
Note
1265 Data truncated for column 'a' at row 1
insert t1 values (20101211030405.789e0);
insert t1 values (20101211030405.789e0);
Warnings:
Warnings:
Warning
1265 Data truncated for column 'a' at row 1
Note
1265 Data truncated for column 'a' at row 1
insert t1 values (99991231235959e1);
insert t1 values (99991231235959e1);
Warnings:
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
Warning 1265 Data truncated for column 'a' at row 1
...
...
mysql-test/suite/maria/ps_maria.result
View file @
ce84ba2f
...
@@ -3256,7 +3256,7 @@ values
...
@@ -3256,7 +3256,7 @@ values
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
insert into t9
insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3264,7 +3264,7 @@ values
...
@@ -3264,7 +3264,7 @@ values
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
( 51, @arg00, @arg00, @arg00, @arg00, @arg00) ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt1 from "insert into t9
prepare stmt1 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3273,7 +3273,7 @@ values
...
@@ -3273,7 +3273,7 @@ values
execute stmt1 ;
execute stmt1 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
prepare stmt2 from "insert into t9
prepare stmt2 from "insert into t9
( c1, c13, c14, c15, c16, c17 )
( c1, c13, c14, c15, c16, c17 )
...
@@ -3282,7 +3282,7 @@ values
...
@@ -3282,7 +3282,7 @@ values
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning
1265 Data truncated for column 'c16' at row 1
Note
1265 Data truncated for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
set @arg00= 'abc' ;
set @arg00= 'abc' ;
set @arg00= NULL ;
set @arg00= NULL ;
...
...
sql-common/my_time.c
View file @
ce84ba2f
...
@@ -1317,7 +1317,7 @@ int number_to_time(my_bool neg, longlong nr, ulong sec_part,
...
@@ -1317,7 +1317,7 @@ int number_to_time(my_bool neg, longlong nr, ulong sec_part,
ltime
->
year
=
ltime
->
month
=
ltime
->
day
=
0
;
ltime
->
year
=
ltime
->
month
=
ltime
->
day
=
0
;
ltime
->
time_type
=
MYSQL_TIMESTAMP_TIME
;
ltime
->
time_type
=
MYSQL_TIMESTAMP_TIME
;
*
was_cut
=
MYSQL_TIME_
WARN
_TRUNCATED
;
*
was_cut
=
MYSQL_TIME_
NOTE
_TRUNCATED
;
return
0
;
return
0
;
}
}
...
...
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