summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
Commit message (Expand)AuthorAgeFilesLines
* EXPLAIN DELETE for MariaDBSergey Petrunya2013-02-121-0/+32
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-7/+20
* Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-4/+7
|\
| * mysql-5.5.28Sergei Golubchik2012-10-161-4/+7
| |\
| | * merge 5.1 => 5.5Tor Didriksen2012-07-261-3/+7
| | |\
| | | * Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0Tor Didriksen2012-07-261-3/+7
* | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-0/+1
|/ / /
* | | Merge from 5.3unknown2012-08-241-0/+1
|\ \ \
| * \ \ merge from 5.2unknown2012-08-241-0/+1
| |\ \ \
| | * \ \ Merge from 5.1.unknown2012-08-241-0/+1
| | |\ \ \
| | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-0/+1
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-4/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | 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-0/+3
| | | | |\ \
* | | | | | | always use sql/sql_string.* files, never - client/sql_string.*Sergei Golubchik2011-12-151-4/+0
* | | | | | | fix new String:realloc* variants always to zero-terminate the stringSergei Golubchik2011-12-141-2/+15
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ \
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-22/+56
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | post review changes 2Sergei Golubchik2011-05-191-1/+1
| * | | | | | | | Removed some alias warningsMichael Widenius2011-05-181-2/+3
| * | | | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+12
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+12
| | * | | | | | | Fixed high-impact Windows 64bit warnings (at least 4000 of them)Vladislav Vaintroub2011-02-191-1/+1
| | * | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-3/+7
| | |\ \ \ \ \ \ \
| | * | | | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-0/+9
| * | | | | | | | | fix noisy warnings in header filesVladislav Vaintroub2011-05-041-1/+1
| * | | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+13
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+13
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Merge with alias as StringMichael Widenius2011-02-281-18/+39
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-0/+9
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-18/+30
| * | | | | | | | merge with 5.1Michael Widenius2010-11-301-3/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-3/+7
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-5/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge from 5.1Magne Mahre2011-02-171-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Bug#48053 String::c_ptr has a race and/or does an invalid Magne Mahre2011-02-171-0/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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
| | | |_|/ / | | |/| | |
| * | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-191-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-3/+7
| * | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-2/+6
| * | | | | automerge 5.1-security --> 5.5-security (bug 55424)Gleb Shchepa2010-08-151-1/+1
| |\ \ \ \ \ | | |/ / / /
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+0
* | | | | | merge.Sergei Golubchik2010-11-251-1/+22
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
View Lorry Controller Status