summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.2 merge.Sergei Golubchik2012-08-221-2/+4
|\
| * 5.1 mergeSergei Golubchik2012-08-221-2/+4
| |\
| | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-2/+4
| | |\
| | | * Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-1/+3
* | | | 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
| | | |\
* | | | \ 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
| | |\ \ \ | | | |/ /
| | | * | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).Alexander Nozdrin2011-07-151-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
* | | | | | 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
* | | | | 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-bugteam -> 5.1-bug-42496Dmitry Shulga2010-07-231-15/+9
| | |\ \ \
| | | * | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-15/+9
| | * | | | Fixed bug #42496 - the server could crash on a debug assert after a failureDmitry Shulga2010-07-211-4/+11
| | |/ / /
* | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Bug #52304 valgrind does not like to print un-inited string in Protocol_tex...Andrei Elkin2010-03-231-1/+1
| | * | | Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-3/+3
* | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-18/+0
|/ / / /
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-40/+90
|\ \ \ \ | |/ / /
| * | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-291-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
|\ \ \ \ | |/ / /
| * | | merged 5.0-bugteam -> 5.1-bugteam.Georgi Kodinov2009-02-271-1/+2
| |\ \ \ | | | |/ | | |/|
| * | | Auto-mergeRamil Kalimullin2009-02-261-6/+16
| |\ \ \ | | |/ /
| | * | Fix for bug#19829:make test Failed in mysql_client_testRamil Kalimullin2009-02-261-6/+16
| | |/
| | * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-011-1/+4
| | |\
* | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-2/+3
* | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-031-2/+2
* | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+3
|\ \ \ \ | |/ / /
| * | | Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains thatMattias Jonsson2008-08-111-0/+3