summaryrefslogtreecommitdiff
path: root/sql/item_func.h
Commit message (Expand)AuthorAgeFilesLines
* 5.5-mergeSergei Golubchik2011-07-021-3/+68
|\
| * Bug#11926811 / Bug#60625 Illegal mix of collationsAlexander Barkov2011-04-081-0/+25
| * mergeMattias Jonsson2011-01-281-1/+1
| |\
| | * Update of copyright headers for files I changed this year.Mattias Jonsson2011-01-271-1/+1
| * | Manual merge from 5.1Mattias Jonsson2011-01-101-1/+41
| |\ \ | | |/
| | * mergeMattias Jonsson2011-01-041-1/+41
| | |\
| | | * Bug#54483: valgrind errors when making warnings forMattias Jonsson2010-12-221-1/+1
| | | * Bug#54483: valgrind errors when making warnings for multiline inserts into pa...Mattias Jonsson2010-12-221-1/+41
| * | | MergeKent Boortz2010-12-291-1/+1
| |\ \ \ | | |/ /
| | * | MergeKent Boortz2010-12-291-1/+1
| | |\ \ | | | |/ | | |/|
| | | * - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| * | | mergeGeorgi Kodinov2010-11-261-1/+1
| |\ \ \ | | |/ /
| | * | Bug#54484 explain + prepared statement: crash and Got error -1 from storage e...Sergey Glukhov2010-10-181-1/+1
| * | | mergeGeorgi Kodinov2010-08-131-0/+1
* | | | merge.Sergei Golubchik2010-11-251-5/+99
|\ \ \ \
| * \ \ \ 5.2 mergeSergei Golubchik2010-10-281-0/+1
| |\ \ \ \
| | * \ \ \ merge with 5.1Sergei Golubchik2010-10-251-0/+1
| | |\ \ \ \
| | | * \ \ \ 5.1.51 mergeSergei Golubchik2010-10-191-0/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-1/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-1/+1
| | * | | | | Automerge with 5.1Michael Widenius2010-08-251-0/+15
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly...Michael Widenius2010-08-231-0/+15
| * | | | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-12/+28
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergedSergei Golubchik2010-03-151-0/+28
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-0/+28
| | | |\ \ \ \
| | * | \ \ \ \ merge 5.1->5.2unknown2010-02-011-11/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-11/+0
| | | |\ \ \ \ \
| | * | \ \ \ \ \ merge 5.1-> 5.2unknown2009-12-081-1/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+0
| | | |\ \ \ \ \ \
| * | | | | | | | | Subquery optimizations: non-semijoin materializationSergey Petrunya2010-01-281-2/+6
| * | | | | | | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-0/+1
| |/ / / / / / / /
| * | | | | | | | MergeIgor Babaev2009-11-091-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+1
| | |\ \ \ \ \ \ \
| * | | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+75
| |/ / / / / / / /
| * | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-2/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-2/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-2/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-12/+40
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-33/+58
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-1/+1
| | | * | | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-1/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-1/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-1/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-1/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-1/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \