summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
* merge with MySQL 5.5.27Sergei Golubchik2012-08-091-2/+4
|\
| * merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-1/+3
| |\
| | * Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-1/+3
* | | mergeSergei Golubchik2012-04-071-2/+2
|\ \ \
| * \ \ mergeSergei Golubchik2012-04-051-2/+2
| |\ \ \
| | * \ \ mergeSergei Golubchik2012-04-051-2/+2
| | |\ \ \
| | | * \ \ mysql-5.1.62 mergeSergei Golubchik2012-04-051-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | | |\ \
* | | | | \ \ 5.3 mergeSergei Golubchik2012-01-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-3/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-3/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+5
| | | |\ \ \ \ | | | | |/ / /
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-17/+13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2011-07-151-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).Alexander Nozdrin2011-07-151-2/+2
| * | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-071-13/+9
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | * | | | auto-mergeIgnacio Galarza2009-03-191-6/+17
| | | |\ \ \ \
| | | | * | | | fixed a typoGeorgi Kodinov2009-03-091-1/+1
| | | | * | | | fixed a win32 compile warningGeorgi Kodinov2009-03-091-1/+2
| | | * | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-3/+3
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-42/+73
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-0/+50
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-40/+17
| |\ \ \ \ \ \ \
| | * | | | | | | post-review changes 1Sergei Golubchik2011-05-191-2/+2
| | * | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-34/+17
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233)Michael Widenius2011-05-121-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| * | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-0/+3
* | | | | | | post-merge fixes.Sergei Golubchik2011-07-021-15/+15
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-10/+11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Bug #36022 please log more information about "Sort aborted" queriesTor Didriksen2011-02-021-8/+9
| * | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW overKonstantin Osipov2010-11-121-2/+2
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-18/+0
* | | | | | | merge.Sergei Golubchik2010-11-251-33/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Automatic merge with MariaDB 5.1Michael Widenius2010-11-041-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-031-1/+1
| * | | | | merge with 5.1Sergei Golubchik2010-09-111-4/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+11
| | |\ \ \ \ | | | |/ / /
| * | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+2
| | |\ \ \ \
| * | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-18/+0
| |/ / / / /
| * | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-40/+90
| |\ \ \ \ \
| * | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-4/+63
| * | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-6/+17
| |\ \ \ \ \ \
| * | | | | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-2/+3
View Lorry Controller Status