summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-5/+9
|\
| * Merge 5.3 -> 5.5Alexander Barkov2014-01-271-5/+7
| |\
| | * MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...):Alexander Barkov2014-01-271-5/+7
| * | Merge 5.3->5.5Alexander Barkov2013-11-211-0/+2
| |\ \ | | |/
| | * MDEV-4859 Wrong value and data type of "SELECT MAX(time_column) + 1 FROM t1"Alexander Barkov2013-11-211-0/+2
* | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-14/+21
|\ \ \ | |/ /
| * | Merge 5.3-5.5Igor Babaev2013-10-131-0/+10
| |\ \ | | |/
| | * Fixed bug mdev-5105.Igor Babaev2013-10-101-0/+10
| * | merge 5.3 -> 5.5unknown2013-09-251-14/+11
| |\ \ | | |/
| | * MDEV-5039: incorrect Item_func_regex::update_used_tables()unknown2013-09-251-14/+11
* | | mariadb-5.5.33 mergeSergei Golubchik2013-09-181-41/+205
|\ \ \ | |/ /
| * | Merge from 5.3Alexander Barkov2013-09-101-41/+198
| |\ \ | | |/
| | * MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric contextAlexander Barkov2013-09-091-41/+197
| * | Merge from 5.3Alexander Barkov2013-08-121-0/+7
| |\ \ | | |/
| | * MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00'))Alexander Barkov2013-08-121-0/+7
* | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-3/+17
|\ \ \ | |/ /
| * | mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+7
| |\ \
| | * \ Bug#16073689 : CRASH IN ITEM_FUNC_MATCH::INIT_SEARCH Neeraj Bisht2013-04-201-0/+14
| | |\ \
| | | * | Bug#16073689 : CRASH IN ITEM_FUNC_MATCH::INIT_SEARCH Neeraj Bisht2013-04-201-0/+14
| * | | | Merging from 5.3Alexander Barkov2013-07-081-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-031-3/+3
| * | | | Merge from 5.3Alexander Barkov2013-06-281-0/+7
| |\ \ \ \ | | |/ / /
| | * | | MDEV-4634 Crash in CONVERT_TZAlexander Barkov2013-06-281-0/+6
* | | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-18/+31
|\ \ \ \ \ | |/ / / /
| * | | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLYGleb Shchepa2013-01-311-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLYGleb Shchepa2013-01-311-2/+2
| | | |\ \
| | | | * | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLYGleb Shchepa2013-01-231-2/+2
| | * | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-2/+2
| | | |/ /
| | * | | Bug#14466617 - INVALID WRITES AND/OR CRASH WITH USERPraveenkumar Hulakund2012-11-071-8/+21
| | * | | Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPPORT BIGINT UNSIGNEDNeeraj Bisht2012-10-161-1/+2
| | |\ \ \ | | | |/ /
| * | | | 5.3 mergeSergei Golubchik2013-04-121-14/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | MDEV-4316 MariaDB server crash with signal 11Sergei Golubchik2013-04-061-14/+15
| * | | | 5.3 mergeSergei Golubchik2013-03-271-1/+3
| |\ \ \ \ | | |/ / /
| | * | | MDEV-4283 Assertion `scale <= precision' fails in strings/decimal.cSergei Golubchik2013-03-181-1/+3
| * | | | Fix clang warning (suggest parentheses)Vladislav Vaintroub2013-03-121-0/+2
| * | | | MDEV-4224 : func_math test fails, when clang 3.0 compiler is used.Vladislav Vaintroub2013-03-121-0/+8
* | | | | References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 5.3->5.5 mergeSergei Golubchik2013-02-281-1/+1
| |\ \ \ \ | | |/ / /
| | * | | 5.2 -> 5.3Sergei Golubchik2013-02-281-1/+1
| | |\ \ \
| | | * \ \ 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-1/+1
| | | |\ \ \
| | | | * | | a simpler fix forSergei Golubchik2013-02-281-1/+1
* | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-13/+30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 5.3->5.5Igor Babaev2013-01-231-0/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-3900 Optimizer difference between MySQL and MariaDB with stored function...unknown2013-01-171-0/+13
| * | | | | | 5.3 mergeSergei Golubchik2013-01-151-13/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 5.2->5.3 mergeSergei Golubchik2013-01-101-2/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.1 mergeSergei Golubchik2013-01-101-2/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | mysql-5.1.67 mergeSergei Golubchik2013-01-091-2/+3
| | | | |\ \ \ | | | | | | |/ | | | | | |/|