summaryrefslogtreecommitdiff
path: root/include/m_string.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-8/+0
|\
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-8/+0
* | cleanup: move safe_str*() from sql_acl.cc to m_string.hSergei Golubchik2014-10-101-0/+11
|/
* MDEV-4928 Merge collation customization improvements Alexander Barkov2013-10-021-2/+4
* 10.0-monty mergeSergei Golubchik2013-07-211-1/+1
|\
| * Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-1/+1
* | mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+1
|\ \
| * \ Updated/added copyright headersMurthy Narkedimilli2013-02-261-1/+1
| |\ \
| | * | Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
* | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-0/+9
| |_|/ |/| |
* | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-5/+1
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-1/+3
|\ \ \ | |/ /
| * | Upmerge the AIX compile fix into 5.5.Joerg Bruehe2012-02-161-1/+3
| |\ \ | | |/
| | * Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
* | | 5.3 mergeSergei Golubchik2012-01-131-5/+7
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-6/+19
| |\ \ \
| | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-6/+19
| | |\ \ \
| | | * \ \ Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+9
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-0/+9
| | | | |\ \
| | | | | * | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-0/+9
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-6/+10
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-2/+2
| | | | |\ \ \
| | | | | * | | BUG 11763056 - 55721: AIX 5.1.50 build failing, cannot locate bzeroDavi Arnaut2011-05-271-1/+1
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+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-69/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with 5.2Michael Widenius2011-03-091-1/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+3
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-16/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-15/+0
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-201-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#57994: Compiler flag change build error : my_redel.cDavi Arnaut2010-11-201-1/+1
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-171-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#57994: Compiler flag change build error : my_redel.cDavi Arnaut2010-11-171-2/+2
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+3
* | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-6/+0
* | | | | | | merge.Sergei Golubchik2010-11-251-14/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Post-merge fixes part 1Sergey Petrunya2010-10-101-1/+1
| | |/ / / | |/| | |
| * | | | merge with 5.1Sergei Golubchik2010-09-111-5/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-5/+1
| | |\ \ \ | | | |/ /
| * | | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-3/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+0
| | |\ \ \
| * | \ \ \ mergedSergei Golubchik2010-03-151-9/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-9/+0
| | |\ \ \ \
View Lorry Controller Status