summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
| | | * \ Updated/added copyright headersKent Boortz2011-06-303-6/+13
| | | |\ \
| | | | * | Updated/added copyright headersKent Boortz2011-06-303-6/+8
* | | | | | 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
* | | | | | 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
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE C...Sergey Glukhov2011-04-271-1/+2
| | | | |/ / | | | |/| |
| | | * | | merge to 5.1.Georgi Kodinov2011-02-021-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-021-1/+1
* | | | | mergeVladislav Vaintroub2011-03-291-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | fix VS warning about variable 'unused' being usedVladislav Vaintroub2011-03-291-0/+5
* | | | | mergeVladislav Vaintroub2011-03-261-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-181-2/+6
* | | | | Merge with 5.2Michael Widenius2011-03-092-5/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.1 to get fixes for tests and compiler warningsMichael Widenius2011-03-011-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Get rid of compiler warningsMichael Widenius2011-02-281-0/+3
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+3
| |\ \ \ \ | | |/ / /
| | * | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+3
| * | | | lp:705210 - Compiling with BUILD/compile-pentium64-debug failsSergei Golubchik2011-01-201-4/+5
| * | | | lp:700982 - Non-portable code in client plugin (fails on ARM).Sergei Golubchik2011-01-201-2/+7
* | | | | Fixed compiler warnings and some test failures found by buildbotMichael Widenius2011-02-232-1/+6
|/ / / /
* | | | MBug#698132: Fix wrong buffer calculation in send_change_user_packet()unknown2011-01-061-1/+1
* | | | fix bad merge that broke make distcheckSergei Golubchik2010-09-141-1/+1
* | | | merge with 5.1Sergei Golubchik2010-09-111-4/+1
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+0
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-16/+7
* | | | Fixed compiler warnings and test failuresMichael Widenius2010-08-061-0/+1
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-7/+20
|\ \ \ \ | |/ / /