summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Fix MWL#192 build error: Remove SSL special case for embedded server.unknown2012-02-221-2/+2
* | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-212-27/+2111
|\ \ \ \
| * | | | MWL#192: Fix problem when we first enable MYSQL_OPT_NONBLOCK, then connectunknown2012-01-301-2/+1
| * | | | MWL#192: non-blocking client API, after-review fixes.unknown2012-01-062-578/+1028
| * | | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-203-17/+1613
* | | | | 5.3 mergeSergei Golubchik2012-01-132-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge with 5.2.Michael Widenius2011-12-113-6/+13
| |\ \ \ \ \
| | * \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-243-7/+14
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-213-6/+13
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | | | |\ \ \
* | | | | \ \ \ 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.2->5.3 mergeSergei Golubchik2011-11-121-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 5.1 mergeSergei Golubchik2011-11-121-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | | * | | | | typos fixedSergei Golubchik2011-11-081-1/+1
* | | | | | | | mergeSergei Golubchik2011-11-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-1/+1
* | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-034-7/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Updated/added copyright headersKent Boortz2011-06-304-7/+8
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Updated/added copyright headersKent Boortz2011-06-303-6/+13
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-303-6/+8
* | | | | | | | cleanupsSergei Golubchik2011-10-191-0/+2
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-193-126/+291
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-9/+71
| * | | | | | | Removed check_license() functionSergei Golubchik2011-07-011-56/+0
| * | | | | | | various fixes for buildbot failuresSergei Golubchik2011-06-101-1/+1
| * | | | | | | merge with 5.1-microSergei Golubchik2011-06-071-67/+43
| |\ \ \ \ \ \ \
| | * | | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-19/+28
| * | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-48/+158
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | post review changes 2Sergei Golubchik2011-05-191-7/+4
| | * | | | | | | post-review changes 1Sergei Golubchik2011-05-191-6/+6
| | * | | | | | | lp:705210 Compiling with BUILD/compile-pentium64-debug failsSergei Golubchik2011-03-261-1/+1
| | * | | | | | | Fix compilation on Windows:Vladislav Vaintroub2011-03-241-2/+2
| | * | | | | | | * fix for ALTER TABLE ... MODIFY timestamp->timestamp.Sergei Golubchik2011-03-171-3/+11
| | * | | | | | | followup for lp:730637Sergei Golubchik2011-03-071-1/+1
| | * | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-25/+135
| * | | | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-11/+67
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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-10/+66
| * | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-2/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-2/+3
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| * | | | | | | | mergeVladislav Vaintroub2011-03-291-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /