| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 6 | -15/+909 |
| |\ | |||||
| | * | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 2 | -5/+5 |
| | |\ | |||||
| | * \ | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | Made test-unit run in parlallel. This was achived by having all aria tests th... | Michael Widenius | 2011-05-13 | 1 | -0/+1 |
| | * | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 2 | -1/+796 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 2 | -1/+796 |
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-08 | 5 | -6/+102 |
| | |\ \ \ | |||||
| | | * | | | Reverted unittest/unit.pl back to Test::Harness as some of our build machines... | Michael Widenius | 2011-05-06 | 2 | -16/+12 |
| | | * | | | Improved 'make test-unit' time slightly | Michael Widenius | 2011-05-05 | 5 | -9/+109 |
| | * | | | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Fix compile errors: | Vladislav Vaintroub | 2011-05-02 | 1 | -1/+1 |
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -14/+160 |
| | |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | | * | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -14/+160 |
| | | |\ \ | |||||
| | * | \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+4 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Enhanced tap to write out a message at which stage it was killed if it got a ... | Michael Widenius | 2011-02-12 | 1 | -1/+4 |
| | * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 2 | -5/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 2 | -5/+0 |
| | * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 11 | -30/+43 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 5 | -15/+0 |
| | | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 6 | -15/+43 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -1/+1 |
| * | | | | | unit test fixes for ctest | Sergei Golubchik | 2011-07-16 | 4 | -37/+10 |
| * | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 17 | -208/+263 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug#12552516 LF_HASH REQUIRES MY_THREAD_INIT() | Marc Alff | 2011-05-13 | 1 | -10/+27 |
| | * | | | | | Fix non-portable test of %p in unit test my_vsnprintf | Bjorn Munch | 2011-03-02 | 1 | -1/+4 |
| | * | | | | | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-23 | 1 | -1/+1 |
| | * | | | | | Merge from mysql-5.1 to mysql-5.5 | Jon Olav Hauglid | 2011-02-16 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | | Followup to Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -1/+1 |
| | * | | | | | Merge from mysql-5.1 to mysql-5.5 | Jon Olav Hauglid | 2011-02-16 | 1 | -14/+159 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -14/+159 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 6 | -160/+0 |
| | * | | | | merge from 5.5-mtr | Bjorn Munch | 2010-11-19 | 1 | -4/+28 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Pull in fix from bug#47526 to solve bug#50047. | Jonathan Perkin | 2010-10-14 | 1 | -4/+28 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Bug#47526 unit.pl fails to execute binaries when using Test::Harness 3.10 | Magnus Blåudd | 2010-01-04 | 1 | -3/+34 |
| | * | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-20 | 6 | -15/+43 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 6 | -15/+43 |
| | * | | | | | merge | Georgi Kodinov | 2010-10-04 | 1 | -1/+10 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | merged mysql-5.5 into WL1054-5.5 | Georgi Kodinov | 2010-08-16 | 3 | -8/+6 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed a build error on solaris sparc in the mysql-5.5-wl1054 tree | Georgi Kodinov | 2010-08-10 | 1 | -1/+1 |
| * | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 7 | -8/+299 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 4 | -12/+145 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | | Fixed build & test failures in buildbot | Michael Widenius | 2010-08-28 | 1 | -0/+2 |
| | | * | | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 4 | -12/+143 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -2/+2 |
| | * | | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 4 | -13/+25 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 4 | -13/+25 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |