Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | merge. | Sergei Golubchik | 2010-11-25 | 28 | -187/+423 |
|\ | |||||
| * | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
| * | fix incorrect xtradb plugin metadata. | Sergei Golubchik | 2010-09-11 | 1 | -1/+1 |
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 3 | -21/+18 |
| |\ | |||||
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 3 | -21/+18 |
| | |\ | |||||
| * | \ | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 4 | -4/+32 |
| |\ \ \ | | |/ / | |||||
| | * | | created *-all build scripts that build with ndb | Sergei Golubchik | 2010-08-10 | 4 | -4/+32 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 7 | -5/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 7 | -5/+10 |
| | |\ \ | |||||
| * | \ \ | Merge Oqgraph with MariaDB 5.2 trunk | unknown | 2010-04-09 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler warnings | Michael Widenius | 2010-03-31 | 1 | -1/+1 |
| * | | | | Merge OQGraph into MariaDB 5.2. | unknown | 2010-03-31 | 2 | -5/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | automerge | unknown | 2010-03-30 | 11 | -12/+137 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge OQGraph into latest MariaDB trunk. | unknown | 2010-01-04 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Import OQGraph engine into MariaDB. | unknown | 2010-01-04 | 1 | -1/+1 |
| * | | | | | Added count of my_sync calls (to SHOW STATUS) | Michael Widenius | 2010-03-09 | 2 | -3/+3 |
| * | | | | | Add support in bintar build script for OpenSolaris. | unknown | 2010-01-28 | 1 | -1/+9 |
| * | | | | | Add forgotten file to `make dist`. | unknown | 2010-01-07 | 1 | -1/+2 |
| * | | | | | Add BUILD/compile-bintar, which builds MariaDB with correct options for a bin... | unknown | 2010-01-07 | 4 | -8/+124 |
| * | | | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 5 | -0/+0 |
| |/ / / / | |||||
| * | | | | Fix some compiler warnings. | unknown | 2009-12-06 | 2 | -3/+11 |
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -4/+5 |
| |\ \ \ | |||||
| | * \ \ | Merge with latest MariaDB 5.1 trunk. | unknown | 2009-10-15 | 2 | -0/+11 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -4/+5 |
| | |\ \ \ \ | |||||
| * | | | | | | Compile by default MySQL clients with libmysqldclient.a (not .so) | Michael Widenius | 2009-10-29 | 1 | -8/+9 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | comment added | unknown | 2009-10-07 | 1 | -0/+1 |
| * | | | | | merge | unknown | 2009-10-06 | 2 | -0/+10 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | BUG#39249 Maria:query cache returns out of date results | unknown | 2009-10-06 | 2 | -0/+10 |
| * | | | | | Fix running test suite from installed directory rather than source directory. | unknown | 2009-09-29 | 1 | -1/+1 |
| * | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix `make dist` after solaris build file fixes. | unknown | 2009-08-29 | 1 | -2/+6 |
| * | | | | | Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and | Sergey Petrunya | 2009-09-10 | 1 | -1/+1 |
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+7 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge XtraDB 6 with latest MariaDB 5.1 | unknown | 2009-08-03 | 2 | -0/+48 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 2 | -0/+48 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | XtraDB after-merge fixes. | unknown | 2009-06-09 | 2 | -0/+48 |
| * | | | | | | | Solaris 10 build script fixes by Toby Thain. | unknown | 2009-07-07 | 7 | -2/+70 |
| |/ / / / / / | |||||
| * | | | | | | Merge Toby Thain's Solaris fixes. | unknown | 2009-05-11 | 5 | -150/+83 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Portability changes for Solaris 10 (amd64). Re-hash BUILD/ scripts for Solari... | Toby Thain | 2009-05-09 | 5 | -150/+83 |
| * | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 5 | -9/+10 |
| |/ / / / / | |||||
| * | | | | | Apply patch by Antony Dovgal: | Michael Widenius | 2009-03-22 | 2 | -2/+2 |
| * | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -2/+2 |
| * | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -19/+22 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -0/+2 |
| * | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 6 | -17/+35 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 3 | -1/+38 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 3 | -84/+1583 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mysql.com:/home/kent/bk/maria/mysql-5.1-release | unknown | 2008-02-08 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ |