Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ | |||||
| | * | | Followup to Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -1/+1 |
| | * | | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -14/+159 |
| | |/ | |||||
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 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 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Postfix for BUG#45012. | Alexander Barkov | 2010-07-29 | 1 | -3/+3 |
| | * | Bug#45012 my_like_range_cp932 generates invalid string | Alexander Barkov | 2010-07-26 | 3 | -2/+143 |
| | * | Bug#22320: my_atomic-t unit test fails | Davi Arnaut | 2010-07-05 | 2 | -212/+0 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Backport of Bug#53303 mytap tests should always have a plan() | Tor Didriksen | 2010-06-10 | 4 | -14/+26 |
* | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+1 |
* | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 2 | -1/+157 |
|/ / | |||||
* | | Fixed compiler warnings & failing test cases | Michael Widenius | 2010-01-28 | 1 | -1/+1 |
* | | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -1/+9 |
| |\ \ | | |/ | |||||
* | | | After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge brea... | unknown | 2009-11-26 | 1 | -3/+1 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+9 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | automerge | Georgi Kodinov | 2009-10-04 | 1 | -2/+9 |
| |\ | |||||
| | * | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+9 |
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
| |/ | |||||
* | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+2 |
* | | Trivial fixes for windows compile failures | Sergey Petrunya | 2009-09-01 | 1 | -0/+1 |
* | | Avoid compiler warnings on windows | Michael Widenius | 2009-03-20 | 1 | -0/+7 |
* | | Bug#41092 Maria: timeout in waiting_threads-t | Sergei Golubchik | 2009-02-12 | 1 | -39/+44 |