- developers - lists.mariadb.org

[Maria-developers] merge for MySQL56 FSP data types
by Alexander Barkov 09 Jul '13

09 Jul '13

Hi Serg, Please review the patch merging MySQL-5.6 fractional second precision enabled data types. Thanks.

3 7

[Maria-developers] Connect: compilation warnings
by Alexander Barkov 08 Jul '13

08 Jul '13

Hi Oliver, I fixed almost all compilation warnings that happened in Connect on my Fedora 17 laptop with gcc-4.7.2. Most of them were "variable is initialized but not used" and "no previous declaration". There were not serious, but very unpleasant for developers. (Note, we try to keep the tree in a shape that it compiles without warnings. Connect must follow this rule as well!!!) I think there was a bug in one place: how SQLSetStmtAttr() was called. See "bzr diff -c 3827" for details. The value of m_RowsetSize was erroneously passed, but SQLSetStmtAttr() expects the address of a SQLUINT variable (not a value!). See the ODBC docs for the details: http://msdn.microsoft.com/en-us/library/windows/desktop/ms712631%28v=vs.85%… One compilation warning still remains: maria-10.0-connect/storage/connect/tabsys.cpp:279:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] It looks like a bug. Cast from 4-byte integer to 8-byte pointer is obviously wrong. Please address the problem. Thanks.

1 0

[Maria-developers] Warning in dynamic columns code
by Sergei Petrunia 08 Jul '13

08 Jul '13

Hi Sanja, I have been seeing this warning on a number of platforms: 10.0-monty/sql/item_strfunc.cc: In member function ‘virtual bool Item_func_dyncol_create::fix_fields(THD*, Item**)’: 10.0-monty/sql/item_strfunc.cc:3887: warning: suggest a space before ‘;’ or explicit braces around empty body in ‘for’ statement I assume it is harmless, but just in case, passing it over to you. Could you please check it and get rid of it? Thanks Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

[Maria-developers] SO_REUSEPORT and mariadb
by Roberto Spadim 08 Jul '13

08 Jul '13

hi guys, i was reading the SO_REUSEPORT of kernel 3.9, and i didn't found it in mariadb maybe we could use it? here are the SO_REUSEPORT topics: https://lwn.net/Articles/542629/ http://linux.dell.com/files/presentations/Linux_Plumbers_Conf_2010/Scaling_… here the important parts: ------------------ 1)The first of the traditional approaches is to have a single listener thread that accepts all incoming connections and then passes these off to other threads for processing. The problem with this approach is that the listening thread can become a bottleneck in extreme cases. In early discussions<http://thread.gmane.org/gmane.linux.network/102140/focus=102150> on SO_REUSEPORT, Tom noted that he was dealing with applications that accepted 40,000 connections per second. Given that sort of number, it's unsurprising to learn that Tom works at Google. 2)The second of the traditional approaches used by multithreaded servers operating on a single port is to have all of the threads (or processes) perform an accept() call on a single listening socket in a simple event loop of the form: while (1) { new_fd = accept(...); process_connection(new_fd); } ------------------ i didn -- Roberto Spadim

1 1

[Maria-developers] Replication
by Roberto Spadim 05 Jul '13

05 Jul '13

hi guys, i don't know if it's the better place to ask... maybe in user list is the right one, please tell me what's better... i'm using replication, and i need to mark all tables that don't replicate, it's very sad boring time consuming, etc etc... there's a easier way to mark tables? maybe alter table xxxx REPLICATION=ON/OFF if not, could we add this feature? thanks guys -- Roberto Spadim

1 0

[Maria-developers] Developer course
by Roberto Spadim 05 Jul '13

05 Jul '13

hi guys, there's a internal mysql/mariadb developer course? i'm studying source, but it's a bit difficult understand what's the best class/methods to use, maybe a course could help me developing and understanding better the source any one know about a course like it? i will focus on query rewrite (select.cc), optimizer (opt_range.cc/opt_*) and partition engine, others engine (myisam,heap,innodb,aria) is not my priority now -- Roberto Spadim

2 3

[Maria-developers] Review request : MDEV-573 (mysqlreport update)
by Jean Weisbuch 04 Jul '13

04 Jul '13

Hi, I have been doing modifications to the MariaDB mysqlreport version (which is shipped on the Debian/Ubuntu packages and can be found on the debian/additions/ directory), especially to add stats/informations about MariaDB specific functions but also to fix some bugs and limitations of the tool. As of today, the script works without throwing a warning and seems to output correct informations on MariaDB 5.5 (either with or without threadpool and binary log activated), MariaDB 5.5 + TokuDB, MySQL 5.1, MySQL 5.5 and it solves some small bugs and issues that could lead warning messages, invalid values returned or truncated values. The main additions are the AriaDB pagecache stats, binlog cache stats, subquery cache stats, TokuDB stats and Threadpool stats. There are also some "cosmetic" changes/fixes : the addition of values such as the % of disk tables used or the InnoDB read "From file" modified to "From disk" as of the documentation of the status variables states ; values such as the threads cache size or the table cache size that were limited to 3 chars are now limited to 5 chars ; the per seconds stats was truncated to 5 chars max on Questions and Query Cache sections (for example 153.6k/s was truncated to 153.6/s). The JIRA task : https://mariadb.atlassian.net/browse/MDEV-573 The GIT repository where i put the latest revisions (i only have been using it lately but i commented all the changes and bugfixes along the time on the JIRA task and could provide older revisions/diff if required) : https://github.com/jb-boin/mariadb/blob/5.5.30/debian/additions/mysqlreport I would like to be sure that the values/stats i added are really useful to monitor (and the calculations of these correct) and that the way informations are shown, named and ordered is clear enough ; for example, the way the test that determines if its a MariaDB or a MySQL server might not be the best possible (it checks if the Aria engine is available). There is still an upstream bug on the "Questions" and the "SELECT and Sort" section, the %Total values are not correctly calculated and lead to values > 100%, i havent got time to give it a look yet and i included in the example output below values hitting that bug. Here is an example of the output of the latest revision on a server having about all the possible functions enabled (values are mixed from different servers) : MariaDB 5.5.30-tokudb-7.0.1 uptime 70 9:4:47 Thu Jul 4 01:48:24 2013 __ Key _________________________________________________________________ Buffer used 651.41M of 1.00G %Used: 63.61 Current 675.43M %Usage: 65.96 Write hit 79.79% Read hit 99.99% __ Questions ___________________________________________________________ Total 2.57M 0.4/s -Unknown 39.92M 6.6/s %Total: 1550.4 DMS 39.78M 6.5/s 1545.3 Com_ 2.71M 0.4/s 105.09 COM_QUIT 444 0.0/s 0.02 Slow 4 s 285 0.0/s 0.01 %DMS: 0.00 Log: OFF DMS 39.78M 6.5/s 1545.3 UPDATE 39.76M 6.5/s 1544.5 99.95 SELECT 21.11k 0.0/s 0.82 0.05 REPLACE 0 0/s 0.00 0.00 DELETE 0 0/s 0.00 0.00 INSERT 0 0/s 0.00 0.00 Com_ 2.71M 0.4/s 105.09 show_proces 2.51M 0.4/s 97.33 admin_comma 152.51k 0.0/s 5.92 show_status 9.23k 0.0/s 0.36 __ Rows ________________________________________________________________ Rows 186.00G 240.3k/s Using idx 168.06G 217.1k/s %Index: 90.35 Rows/question 158.90 __ SELECT and Sort _____________________________________________________ Scan 42.33k 0.0/s %SELECT: 200.53 Range 0 0/s 0.00 Full join 19.27k 0.0/s 91.29 Range check 0 0/s 0.00 Full rng join 0 0/s 0.00 Sort scan 0 0/s Sort range 0 0/s Sort mrg pass 0 0/s __ Table Locks _________________________________________________________ Waited 8.86M 11.4/s %Total: 0.46 Immediate 1.93G 2.5k/s __ Tables ______________________________________________________________ Open 6843 of 8192 %Cache: 83.53 Opened 14.14k 0.0/s __ Connections _________________________________________________________ Max used 5403 of 22000 %Max: 24.56 Total 176.48M 228.0/s __ Created Temp ________________________________________________________ Disk table 7.76k 0.0/s %Disk: 14.55 Table 53.38k 0.0/s Size: 64.0M File 12 0.0/s __ Threads _____________________________________________________________ Running 274 of 2788 Created 181.68k 0.2/s Slow 0 0/s Threadpool 892 of 1200 %Used: 74.33 Running 458 of 1200 %Running: 38.17 Idle 434 of 1200 %Idle: 36.17 __ Aborted _____________________________________________________________ Clients 5.03k 0.0/s Connects 3.65k 0.0/s __ Bytes _______________________________________________________________ Sent 1.51T 1.9M/s Received 445.91G 576.0k/s __ InnoDB Buffer Pool __________________________________________________ Usage 25.97G of 26.00G %Usage: 99.89 Read hit 100.00% Pages Free 1.83k %Total: 0.11 Data 1.67M 98.23 %Drty: 0.07 Misc 28381 1.67 Latched 0 0.00 Reads 527.54G 681.5k/s From disk 100.00k 0.1/s %Disk: 0.00 Ahead Rnd 0 0/s Writes 5.21G 6.7k/s Flushes 17.35M 22.4/s Wait Free 9 0.0/s %Wait: 0.00 __ InnoDB Lock _________________________________________________________ Waits 36660726 47.4/s Current 0 Time acquiring Total 627441780 ms Average 171 ms Max 1537520 ms __ InnoDB Data, Pages, Rows ____________________________________________ Data Reads 512.26k 0.7/s Writes 181.92M 235.0/s fsync 2.07M 2.7/s Pending Reads 0 Writes 0 fsync 0 Pages Created 3.72M 4.8/s Read 512.18k 0.7/s Written 17.35M 22.4/s Rows Deleted 175.85M 227.2/s Inserted 200.46M 259.0/s Read 174.52G 225.4k/s Updated 224.40M 289.9/s __ Aria Pagecache ______________________________________________________ Buffer used 3.43M of 512.00M %Used: 0.67 Current 20.26M %Usage: 3.96 Write hit 47.09% Read hit 99.96% __ Subquery Cache ______________________________________________________ Hit ratio 99.91% Hits 38.63G 49.9k/s Miss 35.97M 46.5/s __ Binary Log Cache _____________________________________________________ Disk use Transactional 0.43% Non transactional 0.50% __ TokuDB ______________________________________________________________ Cachetable 4.00G of 4.00G %Usage: 99.99 Miss 1.83M 0.3/s Evictions 1.95M 0.3/s Thanks in advance, Jean Weisbuch

1 0

Re: [Maria-developers] Rev 3824: MDEV-4472 Audit plugin
by Sergei Golubchik 03 Jul '13

03 Jul '13

Hi, Holyfoot! Generally, it looks pretty good. One comment, see below about MARIADB_ONLY. On Jul 02, holyfoot(a)askmonty.org wrote: > revno: 3824 > revision-id: holyfoot(a)askmonty.org-20130702213841-xwmzadaotzxqhz2k > parent: sergii(a)pisem.net-20130701155424-lx0dvaocejx0cn8l > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-4472 > timestamp: Wed 2013-07-03 02:38:41 +0500 > message: > MDEV-4472 Audit plugin. > Plugin implemented in plugin/server_audit/server_audit.c. > Rotating log file support modified to be mysql-service. > === added directory 'plugin/server_audit' > === added file 'plugin/server_audit/CMakeLists.txt' > --- a/plugin/server_audit/CMakeLists.txt 1970-01-01 00:00:00 +0000 > +++ b/plugin/server_audit/CMakeLists.txt 2013-07-02 21:38:41 +0000 > @@ -0,0 +1,16 @@ > +# Copyright (C) 2012 Monty Program Ab. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; version 2 of the License. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + > +MYSQL_ADD_PLUGIN(server_audit server_audit.c MODULE_ONLY) I'd remove MODULE_ONLY, if the plugin can be complied as a static plugin. No need to add artificial restrictions. > === added file 'plugin/server_audit/server_audit.c' > --- a/plugin/server_audit/server_audit.c 1970-01-01 00:00:00 +0000 > +++ b/plugin/server_audit/server_audit.c 2013-07-02 21:38:41 +0000 ... > +#ifndef MARIADB_ONLY > +#define MYSQL_SERVICE_LOGGER_INCLUDED > +#endif /*MARIADB_ONLY*/ Is MARIADB_ONLY normally defined? As far as I can see, it's not. So in the packages this plugin won't have MARIADB_ONLY. That's ok in your tree, but let's think about how to solve this before pushing into the main tree. Regards, Sergei

2 1

[Maria-developers] merge for MySQL56 temporal literals
by Alexander Barkov 03 Jul '13

03 Jul '13

Hi Serg, Please review the patch merging MySQL-5.6 temporal literals. Thanks.

3 4

[Maria-developers] MDEV-4667 DATE('string') incompability between mysql and mariadb
by Alexander Barkov 03 Jul '13

03 Jul '13

Hi Serg, my review comments for http://bazaar.launchpad.net/~maria-captains/maria/5.3-serg/revision/3665 The patch looks ok. Just a couple of small comments: > === modified file 'include/my_time.h' > --- include/my_time.h 2011-12-11 09:34:44 +0000 > +++ include/my_time.h 2013-07-03 07:46:20 +0000 > @@ -68,14 +68,17 @@ > #endif > > /* Flags to str_to_datetime */ > -#define TIME_FUZZY_DATE 1 > + > +/* > + TIME_FUZZY_DATES is used for the result will only be used for comparison > + purposes. Conversion is as relaxed as possible. > +*/ > +#define TIME_FUZZY_DATES 1 > #define TIME_DATETIME_ONLY 2 > #define TIME_TIME_ONLY 4 > -/* Must be same as MODE_NO_ZERO_IN_DATE */ > -#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2) > -/* Must be same as MODE_NO_ZERO_DATE */ > -#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2) > -#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2) > +#define TIME_NO_ZERO_IN_DATE (1UL << 23) /* == MODE_NO_ZERO_IN_DATE */ > +#define TIME_NO_ZERO_DATE (1UL << 24) /* == MODE_NO_ZERO_DATE */ > +#define TIME_INVALID_DATES (1UL << 25) /* == MODE_INVALID_DATES */ > > #define MYSQL_TIME_WARN_TRUNCATED 1 > #define MYSQL_TIME_WARN_OUT_OF_RANGE 2 > > === modified file 'libmysql/libmysql.c' > --- libmysql/libmysql.c 2013-01-10 14:40:21 +0000 > +++ libmysql/libmysql.c 2013-07-03 07:46:20 +0000 > @@ -3549,7 +3549,7 @@ > case MYSQL_TYPE_TIME: > { > MYSQL_TIME *tm= (MYSQL_TIME *)buffer; > - str_to_time(value, length, tm, TIME_FUZZY_DATE, &err); > + str_to_time(value, length, tm, 0, &err); > *param->error= test(err); > break; > } > @@ -3558,7 +3558,7 @@ > case MYSQL_TYPE_TIMESTAMP: > { > MYSQL_TIME *tm= (MYSQL_TIME *)buffer; > - (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err); > + (void) str_to_datetime(value, length, tm, 0, &err); > *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && > tm->time_type != MYSQL_TIMESTAMP_DATE); > break; > @@ -3681,9 +3681,7 @@ > case MYSQL_TYPE_DATETIME: > { > int error; > - value= number_to_datetime(value, 0, > - (MYSQL_TIME *) buffer, TIME_FUZZY_DATE, > - &error); > + value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error); > *param->error= test(error); > break; > } > > === modified file 'mysql-test/r/adddate_454.result' > --- mysql-test/r/adddate_454.result 2012-08-29 15:55:59 +0000 > +++ mysql-test/r/adddate_454.result 2013-07-03 07:46:20 +0000 > @@ -4,6 +4,8 @@ > d > 2012-00-00 > update t1 set d = adddate(d, interval 1 day); > +Warnings: > +Warning 1292 Incorrect datetime value: '2012-00-00' > select * from t1; > d > NULL > > === modified file 'mysql-test/r/cast.result' > --- mysql-test/r/cast.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/cast.result 2013-07-03 07:46:20 +0000 > @@ -268,37 +268,37 @@ > 0001-02-03 10:11:12 > select cast(120010203101112.121314 as datetime); > cast(120010203101112.121314 as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '120010203101112.121314' > select cast(cast(1.1 as decimal) as datetime); > cast(cast(1.1 as decimal) as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '1' > select cast(cast(-1.1 as decimal) as datetime); > cast(cast(-1.1 as decimal) as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '-1' > select cast('0' as date); > cast('0' as date) > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '0' > select cast('' as date); > cast('' as date) > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '' > select cast('0' as datetime); > cast('0' as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '0' > select cast('' as datetime); > cast('' as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '' > select cast('0' as time); > @@ -306,7 +306,7 @@ > 00:00:00 > select cast('' as time); > cast('' as time) > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '' > select cast(NULL as DATE); > @@ -323,13 +323,13 @@ > NULL > select cast(cast(120010203101112.121314 as double) as datetime); > cast(cast(120010203101112.121314 as double) as datetime) > -0000-00-00 00:00:00 > +NULL > select cast(cast(1.1 as double) as datetime); > cast(cast(1.1 as double) as datetime) > 0000-00-00 00:00:01 > select cast(cast(-1.1 as double) as datetime); > cast(cast(-1.1 as double) as datetime) > -0000-00-00 00:00:00 > +NULL > explain extended select cast(10 as double(5,2)); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used > @@ -764,4 +764,10 @@ > CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY > NULL > Warnings: > -Warning 1292 Truncated incorrect date value: '0000-00-00' > +Warning 1292 Incorrect datetime value: '0000-00-00' > +SET SQL_MODE=ALLOW_INVALID_DATES; > +SELECT DATE("foo"); > +DATE("foo") > +NULL > +Warnings: > +Warning 1292 Incorrect datetime value: 'foo' > > === modified file 'mysql-test/r/date_formats.result' > --- mysql-test/r/date_formats.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/date_formats.result 2013-07-03 07:46:20 +0000 > @@ -586,7 +586,7 @@ > 1 AM > SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); > DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) > -1151414896 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '%Y-%m-%d %H:%i:%s' > select str_to_date('04 /30/2004', '%m /%d/%Y'); > > === modified file 'mysql-test/r/func_sapdb.result' > --- mysql-test/r/func_sapdb.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/func_sapdb.result 2013-07-03 07:46:20 +0000 > @@ -168,7 +168,7 @@ > 1997-12-31 > select date("1997-13-31 23:59:59.000001"); > date("1997-13-31 23:59:59.000001") > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '1997-13-31 23:59:59.000001' > select time("1997-12-31 23:59:59.000001"); > @@ -176,7 +176,7 @@ > 23:59:59.000001 > select time("1997-12-31 25:59:59.000001"); > time("1997-12-31 25:59:59.000001") > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '1997-12-31 25:59:59.000001' > select microsecond("1997-12-31 23:59:59.000001"); > @@ -250,8 +250,6 @@ > select microsecond(19971231235959.01) as a; > a > 10000 > -Warnings: > -Warning 1292 Truncated incorrect time value: '19971231235959.01' > select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a; > a > 1997-12-31 00:00:10.090000 > > === modified file 'mysql-test/r/func_time.result' > --- mysql-test/r/func_time.result 2013-06-17 15:25:55 +0000 > +++ mysql-test/r/func_time.result 2013-07-03 07:46:20 +0000 > @@ -1239,14 +1239,13 @@ > set time_zone= @@global.time_zone; > select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; > str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:10:00 > select str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute; > str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute > NULL > Warnings: > -Error 1411 Incorrect datetime value: '1997-00-04 22:23:00' for function str_to_date > +Warning 1292 Truncated incorrect date value: '1997-00-04 22:23:00' > +Warning 1292 Incorrect datetime value: '1997-00-04' > create table t1 (field DATE); > insert into t1 values ('2006-11-06'); > select * from t1 where field < '2006-11-06 04:08:36.0'; > @@ -1452,13 +1451,15 @@ > NULL > SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1); > WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1) > -0 > +NULL > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > # > # Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0, > # > DO WEEK((DATE_ADD((CAST(0 AS DATE)), INTERVAL 1 YEAR_MONTH)), 5); > Warnings: > -Warning 1292 Incorrect datetime value: '0' > +Warning 1292 Incorrect datetime value: '0000-00-00' > # > # BUG#13458237 INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY > # SIMILAR TO '2009-10-00' > @@ -1755,7 +1756,7 @@ > Warning 1441 Datetime function: time field overflow > select cast('131415.123e0' as time); > cast('131415.123e0' as time) > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '131415.123e0' > select cast('2010-01-02 03:04:05' as datetime) between null and '2010-01-02 03:04:04'; > @@ -1775,12 +1776,12 @@ > NULL > select truncate(date('2010-40-10'), 6); > truncate(date('2010-40-10'), 6) > -0.000000 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '2010-40-10' > select extract(month from '2010-40-50'); > extract(month from '2010-40-50') > -0 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '2010-40-50' > select subtime('0000-00-10 10:10:10', '30 10:00:00'); > @@ -1858,6 +1859,8 @@ > select timestampadd(week, 1, f1) from t1; > timestampadd(week, 1, f1) > NULL > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > select timestampadd(week, 1, date("0000-00-00")); > timestampadd(week, 1, date("0000-00-00")) > NULL > > === modified file 'mysql-test/r/parser.result' > --- mysql-test/r/parser.result 2011-03-01 12:24:36 +0000 > +++ mysql-test/r/parser.result 2013-07-03 07:46:20 +0000 > @@ -555,14 +555,10 @@ > DROP TABLE IF EXISTS t1; > SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; > STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:10:00 > SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE; > STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:01:00 > SELECT "1997-12-31 23:59:59" + INTERVAL 1 SECOND; > "1997-12-31 23:59:59" + INTERVAL 1 SECOND > 1998-01-01 00:00:00 > > === modified file 'mysql-test/r/partition_pruning.result' > --- mysql-test/r/partition_pruning.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/partition_pruning.result 2013-07-03 07:46:20 +0000 > @@ -1906,10 +1906,9 @@ > # test with an invalid date, which lead to item->null_value is set. > EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-99' AS DATETIME); > id select_type table partitions type possible_keys key key_len ref rows Extra > -1 SIMPLE t1 p20090401 ALL NULL NULL NULL NULL 2 Using where > +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Warning 1292 Incorrect datetime value: '2009-04-99' > -Warning 1292 Incorrect datetime value: '2009-04-99' > DROP TABLE t1; > CREATE TABLE t1 > (a INT NOT NULL AUTO_INCREMENT, > > === modified file 'mysql-test/r/type_date.result' > --- mysql-test/r/type_date.result 2013-06-28 08:00:25 +0000 > +++ mysql-test/r/type_date.result 2013-07-03 07:46:20 +0000 > @@ -136,7 +136,7 @@ > 1311 > select year(@d), month(@d), day(@d), cast(@d as date); > year(@d) month(@d) day(@d) cast(@d as date) > -0 0 0 0000-00-00 > +NULL NULL NULL NULL > Warnings: > Warning 1292 Incorrect datetime value: '1311' > Warning 1292 Incorrect datetime value: '1311' > > === modified file 'mysql-test/r/type_datetime.result' > --- mysql-test/r/type_datetime.result 2013-06-28 08:00:25 +0000 > +++ mysql-test/r/type_datetime.result 2013-07-03 07:46:20 +0000 > @@ -657,8 +657,8 @@ > insert into t1 values ('2000-12-03','22:55:23'),('2008-05-03','10:19:31'); > select case when d = '2012-12-12' then d else t end as cond, group_concat( d ) from t1 group by cond; > cond group_concat( d ) > -0000-00-00 00:00:00 2000-12-03 > -0000-00-00 00:00:00 2008-05-03 > +NULL 2000-12-03 > +NULL 2008-05-03 > Warnings: > Warning 1292 Incorrect datetime value: '22:55:23' > Warning 1292 Incorrect datetime value: '10:19:31' > > === modified file 'mysql-test/suite/vcol/r/vcol_misc.result' > --- mysql-test/suite/vcol/r/vcol_misc.result 2013-01-22 05:29:19 +0000 > +++ mysql-test/suite/vcol/r/vcol_misc.result 2013-07-03 07:46:20 +0000 > @@ -187,7 +187,11 @@ > tsv TIMESTAMP AS (ADDDATE(ts, INTERVAL 1 DAY)) VIRTUAL > ) ENGINE=MyISAM; > INSERT INTO t1 (tsv) VALUES (DEFAULT); > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > INSERT DELAYED INTO t1 (tsv) VALUES (DEFAULT); > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > FLUSH TABLES; > SELECT COUNT(*) FROM t1; > COUNT(*) > > === modified file 'mysql-test/t/cast.test' > --- mysql-test/t/cast.test 2012-05-20 12:57:29 +0000 > +++ mysql-test/t/cast.test 2013-07-03 07:46:20 +0000 > @@ -439,3 +439,6 @@ > # > SELECT CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY; > > +SET SQL_MODE=ALLOW_INVALID_DATES; > +SELECT DATE("foo"); > + > > === modified file 'sql-common/my_time.c' > --- sql-common/my_time.c 2012-06-08 17:15:01 +0000 > +++ sql-common/my_time.c 2013-07-03 07:46:20 +0000 > @@ -83,7 +83,7 @@ > { > if (not_zero_date) > { > - if ((((flags & TIME_NO_ZERO_IN_DATE) || !(flags & TIME_FUZZY_DATE)) && > + if (((flags & TIME_NO_ZERO_IN_DATE) && > (ltime->month == 0 || ltime->day == 0)) || ltime->neg || > (!(flags & TIME_INVALID_DATES) && > ltime->month && ltime->day > days_in_month[ltime->month-1] && > @@ -115,7 +115,7 @@ > length Length of string > l_time Date is stored here > flags Bitmap of following items > - TIME_FUZZY_DATE Set if we should allow partial dates > + TIME_FUZZY_DATE > TIME_DATETIME_ONLY Set if we only allow full datetimes. > TIME_NO_ZERO_IN_DATE Don't allow partial dates > TIME_NO_ZERO_DATE Don't allow 0000-00-00 date > @@ -1324,7 +1324,7 @@ > if (nr > 9999999 && neg == 0) > { > if (number_to_datetime(nr, sec_part, ltime, > - TIME_FUZZY_DATE | TIME_INVALID_DATES, was_cut) < 0) > + TIME_INVALID_DATES, was_cut) < 0) > return -1; > > ltime->year= ltime->month= ltime->day= 0; > > === modified file 'sql/field.cc' > --- sql/field.cc 2013-02-28 20:48:47 +0000 > +++ sql/field.cc 2013-07-03 07:46:20 +0000 > @@ -5127,10 +5127,9 @@ > Lazy_string_str str(from, len); > > func_res= str_to_datetime(from, len, &ltime, > - (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), > + MODE_INVALID_DATES)), Why not to add a new method in THD to return these sql_mode datetime flags? These flags repeat many times. Something similar to sql_mode_for_dates(), but always returning the "strict_date_checking" version that ORs all three flags: return thd->variables.sql_mode & (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | MODE_INVALID_DATES); By the way, sql_mode_for_dates() is used in str_to_datetime_with_warn() and Item::send(). Do you know why? Perhaps they also should follow all these three sql_mode date flags... > &error); > return store_TIME_with_warning(&ltime, &str, error, func_res > MYSQL_TIMESTAMP_ERROR); > } > @@ -5144,11 +5143,10 @@ > Lazy_string_double str(nr); > > longlong tmp= double_to_datetime(nr, &ltime, > - (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > > @@ -5161,11 +5159,10 @@ > THD *thd= table->in_use; > Lazy_string_num str(nr); > > - tmp= number_to_datetime(nr, 0, &ltime, (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + tmp= number_to_datetime(nr, 0, &ltime, (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > @@ -5181,17 +5178,16 @@ > structure always fit into DATETIME range. > */ > have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0, > - (TIME_FUZZY_DATE | > - (current_thd->variables.sql_mode & > + (current_thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); > } > > my_decimal *Field_temporal::val_decimal(my_decimal *d) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) Now get_date() is called in a lot of places with 0 flags. Why not to add a method: bool get_date(MYSQL_TIME *ltime) { return get_date(ltime, 0); } And a similar wrapper for get_arg0_date(), with flags==0... ? > { > bzero(&ltime, sizeof(ltime)); > ltime.time_type= mysql_type_to_time_type(type()); > @@ -5330,7 +5326,8 @@ > bool Field_time::get_date(MYSQL_TIME *ltime, uint fuzzydate) > { > THD *thd= table->in_use; > - if (!(fuzzydate & (TIME_FUZZY_DATE|TIME_TIME_ONLY))) > + if (!(fuzzydate & TIME_TIME_ONLY) && > + (fuzzydate & TIME_NO_ZERO_IN_DATE)) > { > push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, > ER_WARN_DATA_OUT_OF_RANGE, > @@ -5459,7 +5456,7 @@ > ltime->time_type= MYSQL_TIMESTAMP_TIME; > ltime->hour+= (ltime->month*32+ltime->day)*24; > ltime->month= ltime->day= 0; > - return fuzzydate & (TIME_FUZZY_DATE | TIME_TIME_ONLY) ? 0 : 1; > + return !(fuzzydate & TIME_TIME_ONLY) && (fuzzydate & TIME_NO_ZERO_IN_DATE); > } > > > @@ -5848,7 +5845,7 @@ > bool Field_datetime::send_binary(Protocol *protocol) > { > MYSQL_TIME tm; > - Field_datetime::get_date(&tm, TIME_FUZZY_DATE); > + Field_datetime::get_date(&tm, 0); > return protocol->store(&tm, 0); > } > > @@ -5931,7 +5928,7 @@ > if (!tmp) > return (fuzzydate & TIME_NO_ZERO_DATE) != 0; > if (!ltime->month || !ltime->day) > - return !(fuzzydate & TIME_FUZZY_DATE); > + return fuzzydate & TIME_NO_ZERO_IN_DATE; > return 0; > } > > @@ -5984,11 +5981,10 @@ > error= 2; > } > else > - tmp= number_to_datetime(nr, sec_part, &ltime, (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + tmp= number_to_datetime(nr, sec_part, &ltime, (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > @@ -5996,7 +5992,7 @@ > bool Field_datetime_hires::send_binary(Protocol *protocol) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return protocol->store(&ltime, dec); > } > > @@ -6004,14 +6000,14 @@ > double Field_datetime_hires::val_real(void) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return TIME_to_double(&ltime); > } > > longlong Field_datetime_hires::val_int(void) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return TIME_to_ulonglong_datetime(&ltime); > } > > @@ -6020,7 +6016,7 @@ > String *unused __attribute__((unused))) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > str->alloc(field_length+1); > str->length(field_length); > my_datetime_to_str(&ltime, (char*) str->ptr(), dec); > @@ -6035,7 +6031,7 @@ > if (!packed) > return fuzzydate & TIME_NO_ZERO_DATE; > if (!ltime->month || !ltime->day) > - return !(fuzzydate & TIME_FUZZY_DATE); > + return fuzzydate & TIME_NO_ZERO_IN_DATE; > return 0; > } > > > === modified file 'sql/field_conv.cc' > --- sql/field_conv.cc 2012-04-05 21:07:18 +0000 > +++ sql/field_conv.cc 2013-07-03 07:46:20 +0000 > @@ -413,7 +413,7 @@ > static void do_field_temporal(Copy_field *copy) > { > MYSQL_TIME ltime; > - copy->from_field->get_date(&ltime, TIME_FUZZY_DATE); > + copy->from_field->get_date(&ltime, 0); > copy->to_field->store_time_dec(&ltime, copy->from_field->decimals()); > } > > @@ -884,7 +884,7 @@ > if (from->cmp_type() == TIME_RESULT) > { > MYSQL_TIME ltime; > - if (from->get_date(&ltime, TIME_FUZZY_DATE)) > + if (from->get_date(&ltime, 0)) > return to->reset(); > else > return to->store_time_dec(&ltime, from->decimals()); > > === modified file 'sql/filesort.cc' > --- sql/filesort.cc 2013-03-17 06:41:22 +0000 > +++ sql/filesort.cc 2013-07-03 07:46:20 +0000 > @@ -868,7 +868,7 @@ > else > { > MYSQL_TIME buf; > - if (item->get_date_result(&buf, TIME_FUZZY_DATE | TIME_INVALID_DATES)) > + if (item->get_date_result(&buf, TIME_INVALID_DATES)) > { > DBUG_ASSERT(maybe_null); > DBUG_ASSERT(item->null_value); > > === modified file 'sql/item.cc' > --- sql/item.cc 2013-03-17 06:41:22 +0000 > +++ sql/item.cc 2013-07-03 07:46:20 +0000 > @@ -252,7 +252,7 @@ > String *Item::val_string_from_date(String *str) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE) || > + if (get_date(&ltime, 0) || > str->alloc(MAX_DATE_STRING_REP_LENGTH)) > { > null_value= 1; > @@ -308,7 +308,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > { > my_decimal_set_zero(decimal_value); > null_value= 1; // set NULL, stop processing > @@ -367,7 +367,7 @@ > int Item::save_date_in_field(Field *field) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return set_field_to_null_with_conversions(field, 0); > field->set_notnull(); > return field->store_time_dec(&ltime, decimals); > @@ -1205,7 +1205,7 @@ > if allowed, otherwise - null. > */ > bzero((char*) ltime,sizeof(*ltime)); > - return null_value|= (fuzzydate & (TIME_NO_ZERO_DATE|TIME_NO_ZERO_IN_DATE)); > + return null_value|= !(fuzzydate & TIME_FUZZY_DATES); > } > > bool Item::get_seconds(ulonglong *sec, ulong *sec_part) > @@ -6032,7 +6032,7 @@ > case MYSQL_TYPE_TIMESTAMP: > { > MYSQL_TIME tm; > - get_date(&tm, TIME_FUZZY_DATE | sql_mode_for_dates()); > + get_date(&tm, sql_mode_for_dates()); > if (!null_value) > { > if (f_type == MYSQL_TYPE_DATE) > @@ -8161,8 +8161,8 @@ > } > else > { > - field->get_date(&field_time, TIME_FUZZY_DATE | TIME_INVALID_DATES); > - item->get_date(&item_time, TIME_FUZZY_DATE | TIME_INVALID_DATES); > + field->get_date(&field_time, TIME_INVALID_DATES); > + item->get_date(&item_time, TIME_INVALID_DATES); > } > return my_time_compare(&field_time, &item_time); > } > @@ -8343,7 +8343,7 @@ > value_cached= true; > > MYSQL_TIME ltime; > - if (example->get_date_result(&ltime, TIME_FUZZY_DATE)) > + if (example->get_date_result(&ltime, 0)) > value=0; > else > value= pack_time(&ltime); > > === modified file 'sql/item.h' > --- sql/item.h 2013-05-03 13:07:13 +0000 > +++ sql/item.h 2013-07-03 07:46:20 +0000 > @@ -936,7 +936,7 @@ > Item **ref, bool skip_registered); > virtual bool get_date(MYSQL_TIME *ltime,uint fuzzydate); > bool get_time(MYSQL_TIME *ltime) > - { return get_date(ltime, TIME_TIME_ONLY | TIME_FUZZY_DATE); } > + { return get_date(ltime, TIME_TIME_ONLY); } > bool get_seconds(ulonglong *sec, ulong *sec_part); > virtual bool get_date_result(MYSQL_TIME *ltime,uint fuzzydate) > { return get_date(ltime,fuzzydate); } > > === modified file 'sql/item_cmpfunc.cc' > --- sql/item_cmpfunc.cc 2013-02-25 03:16:11 +0000 > +++ sql/item_cmpfunc.cc 2013-07-03 07:46:20 +0000 > @@ -713,7 +713,7 @@ > bool value; > int error; > enum_mysql_timestamp_type timestamp_type; > - int flags= TIME_FUZZY_DATE | MODE_INVALID_DATES; > + int flags= TIME_FUZZY_DATES | MODE_INVALID_DATES; > > if (warn_type == MYSQL_TIMESTAMP_TIME) > flags|= TIME_TIME_ONLY; > @@ -885,7 +885,7 @@ > else > { > MYSQL_TIME ltime; > - uint fuzzydate= TIME_FUZZY_DATE | TIME_INVALID_DATES; > + uint fuzzydate= TIME_FUZZY_DATES | TIME_INVALID_DATES; > if (f_type == MYSQL_TYPE_TIME) > fuzzydate|= TIME_TIME_ONLY; > if (item->get_date(&ltime, fuzzydate)) > > === modified file 'sql/item_func.cc' > --- sql/item_func.cc 2013-06-28 08:00:25 +0000 > +++ sql/item_func.cc 2013-07-03 07:46:20 +0000 > @@ -2538,7 +2538,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return TIME_to_double(&ltime); > @@ -2567,7 +2567,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return TIME_to_ulonglong(&ltime); > @@ -2597,7 +2597,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return date2my_decimal(&ltime, dec); > > === modified file 'sql/item_strfunc.cc' > --- sql/item_strfunc.cc 2013-03-26 18:09:47 +0000 > +++ sql/item_strfunc.cc 2013-07-03 07:46:20 +0000 > @@ -3618,10 +3618,10 @@ > } > break; > case DYN_COL_DATETIME: > - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); > + args[valpos]->get_date(&vals[i].x.time_value, 0); > break; > case DYN_COL_DATE: > - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); > + args[valpos]->get_date(&vals[i].x.time_value, 0); > break; > case DYN_COL_TIME: > args[valpos]->get_time(&vals[i].x.time_value); > > === modified file 'sql/item_timefunc.cc' > --- sql/item_timefunc.cc 2013-06-28 08:00:25 +0000 > +++ sql/item_timefunc.cc 2013-07-03 07:46:20 +0000 > @@ -791,7 +791,7 @@ > MYSQL_TIME ltime; > longlong res; > int dummy; /* unused */ > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > { > /* got NULL, leave the incl_endp intact */ > return LONGLONG_MIN; > @@ -855,14 +855,14 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.day; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.day; > } > > longlong Item_func_month::val_int() > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.month; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.month; > } > > > @@ -907,7 +907,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > return 0; > return (longlong) ((ltime.month+2)/3); > } > @@ -981,7 +981,7 @@ > DBUG_ASSERT(fixed == 1); > uint year; > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > return (longlong) calc_week(&ltime, > week_mode((uint) args[1]->val_int()), > @@ -994,7 +994,7 @@ > DBUG_ASSERT(fixed == 1); > uint year,week; > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > week= calc_week(&ltime, > (week_mode((uint) args[1]->val_int()) | WEEK_YEAR), > @@ -1008,7 +1008,7 @@ > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > > return (longlong) calc_weekday(calc_daynr(ltime.year, ltime.month, > @@ -1050,7 +1050,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.year; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.year; > } > > > @@ -1082,7 +1082,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > { > /* got NULL, leave the incl_endp intact */ > return LONGLONG_MIN; > @@ -1354,7 +1354,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > longlong v= TIME_to_ulonglong(&ltime); > return ltime.neg ? -v : v; > @@ -1365,7 +1365,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > return TIME_to_double(&ltime); > } > @@ -1744,7 +1744,7 @@ > int is_time_flag = is_time_format ? TIME_TIME_ONLY : 0; > DBUG_ASSERT(fixed == 1); > > - if (get_arg0_date(&l_time, TIME_FUZZY_DATE | is_time_flag)) > + if (get_arg0_date(&l_time, is_time_flag)) > return 0; Perhaps now it's easier to put the expression directly to get_arg0_date(), instead of having a variable. > > if (!(format = args[1]->val_str(str)) || !format->length()) > @@ -1923,10 +1923,15 @@ > { > INTERVAL interval; > > - if (args[0]->get_date(ltime, TIME_NO_ZERO_DATE | TIME_FUZZY_DATE | TIME_NO_ZERO_IN_DATE) || > + if (args[0]->get_date(ltime, 0) || > get_interval_value(args[1], int_type, &value, &interval)) > return (null_value=1); > > + if (ltime->time_type != MYSQL_TIMESTAMP_TIME && > + check_date_with_warn(ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE, > + MYSQL_TIMESTAMP_ERROR)) > + return (null_value=1); > + > if (date_sub_interval) > interval.neg = !interval.neg; > > @@ -2019,7 +2024,7 @@ > long neg; > int is_time_flag = date_value ? 0 : TIME_TIME_ONLY; One more time (see the previous comment) > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE | is_time_flag)) > + if (get_arg0_date(&ltime, is_time_flag)) > return 0; > neg= ltime.neg ? -1 : 1; > > @@ -2430,7 +2435,7 @@ > > if (is_date) // TIMESTAMP function > { > - if (get_arg0_date(&l_time1, TIME_FUZZY_DATE) || > + if (get_arg0_date(&l_time1, 0) || > args[1]->get_time(&l_time2) || > l_time1.time_type == MYSQL_TIMESTAMP_TIME || > l_time2.time_type != MYSQL_TIMESTAMP_TIME) > > === modified file 'sql/time.cc' > --- sql/time.cc 2013-06-28 12:25:06 +0000 > +++ sql/time.cc 2013-07-03 07:46:20 +0000 > @@ -263,7 +263,7 @@ > @param nr integer part of the number to convert > @param sec_part microsecond part of the number > @param ltime converted value will be written here > - @param fuzzydate conversion flags (TIME_FUZZY_DATE, etc) > + @param fuzzydate conversion flags (TIME_INVALID_DATE, etc) > @param str original number, as a Lazy_string. For the warning > @param field_name field name or NULL if not a field. For the warning > > @@ -280,6 +280,7 @@ > > if (fuzzydate & TIME_TIME_ONLY) > { > + fuzzydate= TIME_TIME_ONLY; // clear other flags > f_type= MYSQL_TYPE_TIME; > res= number_to_time(neg, nr, sec_part, ltime, &was_cut); > } > @@ -289,7 +290,7 @@ > res= neg ? -1 : number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut); > } > > - if (res < 0 || (was_cut && !(fuzzydate & TIME_FUZZY_DATE))) > + if (res < 0 || (was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE))) > { > make_truncated_value_warning(current_thd, > MYSQL_ERROR::WARN_LEVEL_WARN, str,

2 1