summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
Commit message (Expand)AuthorAgeFilesLines
* Merged the fix for bug lp:944706, mdev-193unknown2012-06-191-1/+1
|\
| * Fix for bug lp:944706, task MDEV-193unknown2012-05-171-1/+1
* | fix an overly agressive optimization in Item_func_conv_charsetSergei Golubchik2012-06-171-4/+20
* | MDEV-316 lp:1009085 Assertion failed: warn_item, file item_cmpfunc.cc, line 3613Sergei Golubchik2012-06-151-0/+8
|/
* 5.3 mergeSergei Golubchik2012-03-061-1/+1
|\
| * Fix for LP BUG#944504 unknown2012-03-051-1/+1
* | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ | |/
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
| | | | * Updated/added copyright headersKent Boortz2011-07-031-2/+3
| | | | |\
| | | | * \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | |\ \
| | | | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-1/+1
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+78
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed all reported bugs for dynamic columns.Michael Widenius2011-05-111-1/+1
| | * | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+68
| * | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-2/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-2/+21
| | |\ \ \ \ | | | | |_|/ | | | |/| |
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-6/+63
|\ \ \ \ \ \
| * \ \ \ \ \ Merging from mysql-5.1Alexander Barkov2011-03-031-2/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bug 11766519 - 59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FA...Alexander Barkov2011-03-031-2/+3
| | | |_|/ / | | |/| | |
| * | | | | Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-101-2/+5
| * | | | | Bug #59632 Assertion failed: arg_length > lengthTor Didriksen2011-02-071-2/+4
| * | | | | Merging from 5.1.Alexander Barkov2011-01-171-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string ...Alexander Barkov2011-01-171-0/+1
| * | | | | Merge of fix for Bug#58165.Martin Hansson2011-01-131-0/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-0/+10
| * | | | | Bug#57737 Character sets: search fails with like, contraction, indexAlexander Barkov2010-11-261-0/+40
* | | | | | merge.Sergei Golubchik2010-11-251-2/+19
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+2
| | |\ \ \ | | | |/ /
| * | | | mergedSergei Golubchik2010-03-151-1/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+12
| | |\ \ \
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+17
| |/ / / /
| * | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+14
| |\ \ \ \
| * \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-6/+6
| |\ \ \ \ \
| * | | | | | Windows fixesunknown2008-01-101-2/+2
* | | | | | | Bug#55912 FORMAT with locale set fails for numbers < 1000Alexander Barkov2010-08-201-4/+4
* | | | | | | Bug#45263 utf32_general_ci, bad effects around CREATE TABLE AS SELECTAlexander Barkov2010-08-181-4/+4
* | | | | | | Bug#54661 sha2() returns BINARY resultAlexander Barkov2010-07-071-8/+5
* | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Backport of:Konstantin Osipov2010-04-131-0/+12
* | | | | | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+4
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-031-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | fixed compiler warningSergey Glukhov2010-03-291-1/+1
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-021-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149Sergey Glukhov2010-03-261-1/+2
| | |_|_|/ / | |/| | | |