summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge 192.168.0.10:mysql/mysql-5.1-maintmsvensson@pilot.mysql.com2007-02-061-0/+3
|\ | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
| * Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-061-0/+3
| |\ | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-02-061-0/+3
| | |\ | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
| | | * Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938ramil/ram@mysql.com/myoffice.izhnet.ru2007-02-061-0/+3
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
| | | | * fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null ↵ramil/ram@mysql.com/myoffice.izhnet.ru2006-12-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values Set null_value in case of wrong data.
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
| * \ \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-5/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 Merge of 'remove compiler warnings when using -Wshadow'
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-5/+5
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-5/+5
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | | * | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
* | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-021-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
| * | | | | | Bug #25643: SEC_TO_TIME function problemgkodinov/kgeorge@macbook.gmz2007-01-301-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for NULL before calling the val_xxx() methods only checks for such arguments that are known to be NULLs at compile time. The arguments that may or may not contain NULLs (e.g. function calls and possibly others) are not checked at all. Fixed by first calling the val_xxx() method and then checking for null in SEC_TO_TIME(). In addition QUARTER() was not returning 0 (as all the val_int() functions do when processing a NULL value).
| * | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-121-48/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
| | * \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-12-081-48/+36
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.0-merge
| | | * | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2006-12-081-48/+36
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
* | | | \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-48/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-081-48/+36
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | * \ \ \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0.b22646bar@bar.intranet.mysql.r18.ru2006-11-201-48/+36
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1.b22646
| | | * | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b22646bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-201-48/+36
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b22646
| | | | * | | | | | Bug#22646 LC_TIME_NAMES: Assignment to non-UTF8 target failsbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-081-47/+36
| | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: After introducing of LC_TIME_NAMES variable, the function date_format() can return international non-ascii characters in month and weekday names. Thus, it cannot return a binary string anymore, because inserting a result of date_format() into a column with non-utf8 character set produces garbage. Fix: date_format() now returns a character string, using "collation_connection" to detect character set and collation for the returned value. This allows to insert results of date_format() properly into columns with various character sets.
* | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Changed header to GPL version 2 only
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-041-2/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-301-2/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called.
| * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-291-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-281-12/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-271-1/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
| | * \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-11/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0-0mrg
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
* | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1pgalbraith@bk-internal.mysql.com2006-12-091-5/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-041-5/+13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| | * \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-291-20/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| | * \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2006-11-291-1/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229ramil/ram@myoffice.izhnet.ru2006-11-291-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
| | | | * | | | | | | | | Fix for bug #22229: Bug in DATE_ADD()ramil/ram@mysql.com/myoffice.izhnet.ru2006-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the manual: date arithmetic operations require complete dates and do not work with incomplete dates such as '2006-07-00' or badly malformed dates.
| | * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2006-11-221-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029ramil/ram@myoffice.izhnet.ru2006-11-221-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
| | | | * | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029ramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-3/+4
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
| | | | | * | | | | | | | | | Fix for bug #22029: str_to_date returning NULL, while date_format works ↵ramil/ram@mysql.com/myoffice.izhnet.ru2006-10-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using identical format. The problem appears when we have a space followed by a non-format symbol. Fix: properly skip spaces.
| | * | | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/mysql-5.0-maintramil/ram@myoffice.izhnet.ru2006-11-161-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.1-maint
| | | * | | | | | | | | | | | after-merge fixup.ramil/ram@mysql.com/myoffice.izhnet.ru2006-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - have to explicitly set null_value.
| | * | | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug23653/my50-bug23653ramil/ram@myoffice.izhnet.ru2006-11-161-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23653/my51-bug23653
| | | * | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653ramil/ram@mysql.com/myoffice.izhnet.ru2006-11-161-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
| | | | * | | | | | | | | | Fix for bug #23653: Crash if last_day('0000-00-00')ramil/ram@mysql.com/myoffice.izhnet.ru2006-11-091-1/+2
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As get_arg0_date() in the Item_func_last_day::get_date() returns 0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.
| | | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintkaa@polly.local2006-10-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/m41-maint--07OGk
| | | | | * | | | | | | | | Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946Kristofer.Pettersson@naruto.2006-10-111-1/+1
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintkaa@polly.local2006-10-111-45/+181
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/m41-maint--07OGk
| | | | | * | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-45/+181
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/m41-maint--07OGk
| | | | * | \ \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug21811/my41-bug21811Kristofer.Pettersson@naruto.2006-10-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into naruto.:C:/cpp/mysql-4.1-maint
| | | | | * | | | | | | | | | | Bug#21811 Odd casting with date + INTERVAL arithmeticKristofer.Pettersson@naruto.2006-09-221-1/+1
| | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The definition of the result type of a type_date function didn't include INTERVAL_WEEK - This patch adds an explicit test for INTERVAL_WEEK which results in the result type for an item_date_add_intervall operation being DATE rather than DATETIME when one parameter is INTERVAL_WEEK.
View Lorry Controller Status