summaryrefslogtreecommitdiff
path: root/sql/protocol.h
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2014-05-091-2/+6
|\
| * MDEV-5138 Numerous test failures in "mtr --ps --embedded".Alexey Botchkov2014-04-151-2/+6
* | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-07-101-14/+0
* | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+19
|\ \ | |/ |/|
| * MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-0/+19
| |\
| | * MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+19
| * | Merge with 5.2.Michael Widenius2011-12-111-2/+5
| |\ \ | | |/ | |/|
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+5
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+5
| | | |\
* | | | \ 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/+5
| | |\ \ \ \
| | | * | | | Backport of TIME->MYSQL_TIME / Y2K fixsetunknown2007-05-161-9/+9
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-1/+0
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-6/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-0/+1
| * | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-6/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-6/+6
| | | |/ / / | | |/| | |
* | | | | | merge.Sergei Golubchik2010-11-251-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+0
| | |_|/ | |/| |
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+1
| |\ \ \ | | |/ /
| * | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-0/+2
* | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+2
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+4
|\ \ \ \
| * \ \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+4
| |\ \ \ \
| | * | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+4
| | | |/ / | | |/| |
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-8/+28
|/ / / /
* | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+2
* | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+3
|/ / /
* | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-291-1/+1
|/ /
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-201-3/+2
|\ \
| * | Bug#12713 "Error in a stored function called from a SELECT doesn't unknown2007-12-121-3/+2
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-141-1/+1
|\ \ \ | |/ / |/| |
| * | Doxygenize comments.unknown2007-10-161-1/+1
* | | Remove net_printf_error(). Do not talk to network directly inunknown2007-11-011-1/+0
|/ /
* | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-13/+13
* | Removed not used define YY_MAGIC_BELOWunknown2007-03-231-9/+9
* | Fix for BUG#735 "Prepared Statements: there is no support for Queryunknown2007-03-091-0/+11
* | manual mergeunknown2007-03-091-6/+6
|\ \
| * | Mechanical class renaming:unknown2007-01-301-6/+6
| |/
* | Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bjunknown2007-02-011-0/+2
|\ \ | |/ |/|
| * Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bjunknown2006-12-221-0/+2
| |\
| | * ndb - fixed for BUG#19896 Last_Errno: 4294967295, Error in Write_rows event: ...unknown2006-12-221-0/+2
| | * Big patch to make embedded-server working in 5.xunknown2006-01-041-0/+9
* | | my_strtoll10-x86.s:unknown2006-12-311-1/+1
* | | Many files:unknown2006-12-231-2/+1
|/ /
* | Merge mysql.com:/home/hf/work/mysql-4.1-mrgunknown2006-11-161-1/+0
|\ \
| * | Bug #19216: Client crashes on long SELECTunknown2006-11-131-1/+0
* | | Fixes to embedded server to be able to run tests with itunknown2006-02-241-0/+9
| |/ |/|
* | Fix for BUG#13549 "Server crash with nested stored proceduresunknown2005-11-231-1/+1