summaryrefslogtreecommitdiff
path: root/include/m_string.h
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \
| * | | | | mwl:98 - libservicesSergei Golubchik2010-03-031-8/+2
| * | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-2/+2
| |/ / / /
| * | | | Cherry-pick revid:psergey@askmonty.org-20090608135546-ut1yrzbah4gdw6e6unknown2009-06-151-1/+2
| * | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-5/+5
| * | | | Fixes for build errors under Windows and compiler warning under LinuxGuilhem Bichot2008-06-261-0/+6
| * | | | Injecting more "const" declarations into code which does not changeunknown2008-04-031-0/+8
| * | | | mysys/my_getopt.cunknown2007-10-191-0/+1
| * | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-2/+5
| |\ \ \ \
| | * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+5
| | |\ \ \ \
| | | * \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge with new versionunknown2007-01-231-2/+5
| | | | |\ \ \ \
| | | | | * | | | Implementation of rows-in-blockunknown2007-01-181-2/+5
* | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-6/+0
* | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-24/+0
* | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-8/+0
* | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-11/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-11/+11
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-4/+4
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-21/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-21/+0
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#53593: Add some instrumentation to improve Valgrind sensitivityMarko Mäkelä2010-05-201-3/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge a change from mysql-5.1-innodb:Marko Mäkelä2010-05-201-3/+0
* | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-7/+9
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-6/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-6/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeGeorgi Kodinov2009-12-241-6/+3
| | |\ \ \ \ \ \
| | | * | | | | | Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-6/+3