summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
Commit message (Expand)AuthorAgeFilesLines
* cleanup: s/const CHARSET_INFO/CHARSET_INFO/Sergei Golubchik2014-12-041-4/+4
* Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+3
|\
| * 5.5 mergeSergei Golubchik2014-11-191-1/+3
| |\
| | * MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492)Alexander Barkov2014-11-101-1/+3
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-2/+21
|\ \ \ | |/ /
| * | - MDEV-6695 Bad column name for UCS2 string literalsAlexander Barkov2014-09-041-1/+1
| * | Moving Item::str_value from public to protected.Alexander Barkov2014-09-031-1/+1
| * | MDEV-6679 Different optimizer plan for "a BETWEEN 'string' AND ?" and "a BETW...Alexander Barkov2014-09-021-0/+9
| * | MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 contextAlexander Barkov2014-09-011-0/+10
* | | bugs in sys_var::val_* codeSergei Golubchik2014-10-101-4/+6
|/ /
* | 5.5.38 mergeSergei Golubchik2014-06-061-0/+3
|\ \ | |/
| * mysql-5.5.38 mergeSergei Golubchik2014-06-031-0/+3
| |\
| | * Bug #18359924: INNODB AND MYISAM CORRUPTION ON PREFIX INDEXESGeorgi Kodinov2014-04-101-0/+3
* | | make append_query_string() more usable:Sergei Golubchik2014-03-261-0/+3
* | | remove append_escaped(), use String::append_for_single_quote() insteadSergei Golubchik2014-03-261-0/+9
* | | small cleanup in sql_acl.cc:Sergei Golubchik2014-03-261-1/+1
* | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-0/+32
|\ \ \
| * \ \ MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-0/+32
| |\ \ \
| | * \ \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+32
| | |\ \ \
| | | * \ \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-0/+32
| | | |\ \ \
| | | | * | | EXPLAIN DELETE for MariaDBSergey Petrunya2013-02-121-0/+32
* | | | | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-0/+5
| |/ / / / /
* | | | | | Merging my_convert() from 10.0-sergAlexander Barkov2013-08-011-3/+7
* | | | | | 10.0-base mergeSergei Golubchik2013-07-181-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-07-171-2/+3
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-2/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-121-1/+2
| | | |\ \
| | | | * | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE Venkatesh Duggirala2013-03-121-1/+2
* | | | | | 10.0-base mergeSergei Golubchik2013-06-061-0/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-06-061-0/+10
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | The bugAlexander Barkov2013-05-081-0/+10
* | | | | String::append_for_single_quote() should signal OOM condition,Sergei Golubchik2013-04-191-1/+1
|/ / / /
* | | | 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