summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
Commit message (Expand)AuthorAgeFilesLines
* merge with MySQL 5.5.27Sergei Golubchik2012-08-091-4/+5
|\
| * merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-4/+4
| |\
| | * Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-4/+4
* | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-2/+2
| |\ \ \
| | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+2
| | |\ \ \
| | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | 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/+2
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-5/+15
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge with 5.1-microSergei Golubchik2011-06-071-1/+2
| |\ \ \ \ \ \
| | * | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-1/+2
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | post review changes 2Sergei Golubchik2011-05-191-1/+1
| | * | | | | | post-review changes 1Sergei Golubchik2011-05-191-1/+1
| | * | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-2/+2
| | | |/ / / / | | |/| | | |
| * | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233)Michael Widenius2011-05-121-1/+1
| * | | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+8
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-4/+6
| | |\ \ \ \ | | | |/ / /
| * | | | | merge with 5.1Michael Widenius2010-11-301-2/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-2/+4
| | |\ \ \ \
* | | \ \ \ \ 5.5-mergeSergei Golubchik2011-07-021-36/+56
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTSAlexander Nozdrin2011-05-061-21/+54
| * | | | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-13/+1
| * | | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-241-2/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-241-2/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov...Alexander Nozdrin2010-11-241-2/+1
| | * | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | mergeGeorgi Kodinov2010-10-041-2/+7
| |\ \ \ \ \
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-81/+20
* | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-5/+5
* | | | | | | merge.Sergei Golubchik2010-11-251-82/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | merge with 5.1Sergei Golubchik2010-09-111-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-0/+1
| | |\ \ \ \
| * | \ \ \ \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-5/+25
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-5/+25
| | |\ \ \ \ \
| * | \ \ \ \ \ merge 5.1->5.2Sergei Golubchik2010-06-011-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+1
| | |\ \ \ \ \ \
| * | | | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-82/+21
| |/ / / / / / /
| * | | | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-151-14/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-0/+14
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+14
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-2/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-2/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+1
| | |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status