summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 to galera-10.0Jan Lindström2013-09-031-34/+48
|\
| * 10.0-monty mergeSergei Golubchik2013-07-211-31/+31
| |\
| | * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-8/+8
| | * Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-2/+2
| | * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-17/+17
| * | 10.0-base mergeSergei Golubchik2013-07-181-3/+17
| |\ \
| | * \ 5.5 mergeSergei Golubchik2013-07-171-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
* | | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge from 10.0-connectAlexander Barkov2013-06-081-3/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixing the problem with my_bool_t defined two times.Alexander Barkov2013-06-031-3/+1
| * | | | | | | | 10.0-base mergeSergei Golubchik2013-06-061-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | 5.5 mergeSergei Golubchik2013-06-061-3/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | 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
| | | | |\ \ \ \ | | | | | |/ / /
* | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+12
|/ / / / / / /
* | | | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-1/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-1/+9
| |\ \ \ \ \ \
| | * | | | | | MDEV-26: Global transaction ID.unknown2013-03-211-0/+8
| | * | | | | | MDEV-500: Session variable for server_idunknown2012-10-231-1/+1
* | | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-478/+352
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-04-141-14/+15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | 5.3 mergeSergei Golubchik2013-04-121-14/+15
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | MDEV-4316 MariaDB server crash with signal 11Sergei Golubchik2013-04-061-14/+15
| * | | | | | | MDEV-3917 multiple use locks (GET_LOCK) in one connection.Alexey Botchkov2013-04-121-286/+302
| * | | | | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real().Sergei Golubchik2013-04-091-168/+12
| * | | | | | | error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-1/+1
| * | | | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-9/+9
| * | | | | | | 5.5 mergeSergei Golubchik2013-03-271-2/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | 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
| | * | | | | 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
* | | | | | | | | Merging utf16le from MySQL-5.6Alexander Barkov2013-03-281-4/+2
| |_|_|_|_|_|_|/ |/| | | | | | |