summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-06-061-2/+2
|\
| * strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-2/+2
* | Fixed errors and compiler warnings found by buildbotMichael Widenius2013-05-051-2/+5
* | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ...Michael Widenius2013-04-171-2/+9
* | 5.5 mergeSergei Golubchik2013-04-141-1/+1
|\ \ | |/
| * 5.3 mergeSergei Golubchik2013-04-121-0/+6
| |\
| | * 5.2 mergeSergei Golubchik2013-04-111-0/+6
| | |\
| | | * 5.1 mergeSergei Golubchik2013-04-111-0/+6
| | | |\
| | | | * MDEV-4088 Replication 10.0 -> 5.5 failsSergei Golubchik2013-04-041-0/+6
* | | | | MDEV-4088 Replication 10.0 -> 5.5 failsSergei Golubchik2013-04-091-0/+6
* | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-072-18/+19
* | | | | 5.5 mergeSergei Golubchik2013-03-271-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-4307 Support at least 48 utf8 characters in username in server and PAMSergei Golubchik2013-03-261-2/+0
| * | | | MDEV-4249 : when autodetecting default client charset on Windows, fallback to...Vladislav Vaintroub2013-03-061-1/+4
* | | | | 5.5 mergeSergei Golubchik2013-01-291-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | 5.3 mergeSergei Golubchik2013-01-151-2/+2
| |\ \ \ \ | | |/ / /
| | * | | 5.2->5.3 mergeSergei Golubchik2013-01-101-2/+2
| | |\ \ \ | | | |/ /
| | | * | one-byte overflow with old passwordsSergei Golubchik2012-12-111-2/+2
| | * | | 5.2 merge.Sergei Golubchik2012-08-221-3/+12
| | |\ \ \ | | | |/ /
| | | * | 5.1 mergeSergei Golubchik2012-08-221-3/+12
| | | |\ \ | | | | |/
| | | | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-3/+12
| | | | |\
* | | | | | cleanup:Sergei Golubchik2013-01-231-6/+1
* | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-232-2/+2
* | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-232-5/+12
* | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-3802. Millisecond timeout support in non-blocking client library.unknown2012-10-121-0/+22
* | | | | | MDEV-457 Inconsistent data truncation on datetime values with fractional seco...Sergei Golubchik2012-09-081-249/+160
* | | | | | Automatic merge with 5.5Michael Widenius2012-09-011-4/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-4/+19
| |\ \ \ \ \
| | * | | | | undo the fix for MySQL Bug#12998841Sergei Golubchik2012-08-082-66/+9
| | * | | | | Bug #12910665: AUTH-PLUGIN-DATA-LEN NOT TESTED FOR VALIDITY BY THE Georgi Kodinov2012-06-291-0/+6
| | * | | | | fixed a missing breakGeorgi Kodinov2012-07-051-0/+1
| | * | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-052-9/+65
| | * | | | | merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-3/+12
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-3/+12
* | | | | | | automatic merge with 5.5Michael Widenius2012-06-271-17/+80
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mergeVladislav Vaintroub2012-06-131-17/+80
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | LP1008334 : Speedup specific datetime queries that got slower with introducti...Vladislav Vaintroub2012-06-081-17/+80
| | * | | | | mergeSergei Golubchik2012-04-051-2/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | mergeSergei Golubchik2012-04-051-2/+2
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-051-2/+2
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
* | | | | | | Added text for errno in error messages by:Michael Widenius2012-05-301-1/+1
|/ / / / / /
* | | | | | Fixed some simple warnings on Windows.Vladislav Vaintroub2012-04-131-13/+0
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | |\ \ \ \
* | | \ \ \ \ merge with mysql-5.5.21Sergei Golubchik2012-03-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merging BUG#13458237 from 5.1.Alexander Barkov2012-01-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | BUG#13458237 - INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY. SIMILAR...Alexander Barkov2012-01-241-1/+1
* | | | | | | MWL#192 after-merge fixes.unknown2012-02-231-1/+1