summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-66/+5
|\
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-66/+5
* | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
|\ \
| * \ 5.5 mergeSergei Golubchik2013-06-061-1/+1
| |\ \
| | * \ mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+1
| | |\ \
| | | * \ BUG#11757250: REPLACE(...) INSIDE A STORED PROCEDURE.Nisha Gopalakrishnan2013-01-121-1/+1
| | | |\ \
| | | | * | BUG#11757250: REPLACE(...) INSIDE A STORED PROCEDURE.Nisha Gopalakrishnan2013-01-121-1/+1
* | | | | | String::append_for_single_quote() should signal OOM condition,Sergei Golubchik2013-04-191-21/+10
|/ / / / /
* | | | | 5.5 mergeSergei Golubchik2013-03-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | The i386 specific code improving character set conversion on the ASCII rangeAlexander Barkov2013-03-111-1/+1
* | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-3/+11
* | | | pre-mergeunknown2012-12-231-73/+0
|\ \ \ \
| * | | | MDEV-377 Name support for dynamic columnsunknown2012-09-281-73/+0
* | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-0/+18
| |/ / / |/| | |
* | | | Merge from 5.3unknown2012-08-241-10/+18
|\ \ \ \ | |/ / / |/| | |
| * | | merge from 5.2unknown2012-08-241-10/+18
| |\ \ \
| | * \ \ Merge from 5.1.unknown2012-08-241-10/+18
| | |\ \ \
| | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-10/+18
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-4/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-2/+5
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-10-311-1/+2
| | | | * | merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-2/+4
| | | | |\ \
| | | | | * | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-2/+4
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \ \ \ | | | | |/ / /
* | | | | | | always use sql/sql_string.* files, never - client/sql_string.*Sergei Golubchik2011-12-151-3/+0
* | | | | | | fix new String:realloc* variants always to zero-terminate the stringSergei Golubchik2011-12-141-2/+1
* | | | | | | 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
| | | * | | | auto-mergeIgnacio Galarza2009-03-191-11/+8
| | | |\ \ \ \
| | | | * \ \ \ Merge from dev tree.Alexey Kopytov2009-02-141-2/+2
| | | | |\ \ \ \
* | | | | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-11/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-2/+2
| * | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | post review changes 2Sergei Golubchik2011-05-191-1/+1
| * | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-4/+37
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-4/+37
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| * | | | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-9/+9
* | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-6/+39
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Bug#11753363 (bug#44793) CHARACTER SETS: CASE CLAUSE, UCS2 OR UTF32, FAILUREAlexander Barkov2011-03-011-2/+2
| * | | | | | | | Merge of fix for Bug#58165.Martin Hansson2011-01-131-4/+37
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-4/+37
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-2/+3
* | | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-58/+0
* | | | | | | | merge.Sergei Golubchik2010-11-251-7/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM...Sergei Golubchik2010-10-241-2/+2
| * | | | | | MWL#36: Add a mysqlbinlog option to change the used databaseSergey Petrunya2009-10-241-0/+3
View Lorry Controller Status