Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 1 | -1992/+2855 |
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -77/+139 |
|\ | |||||
| * | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 1 | -77/+122 |
* | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -1/+1 |
* | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -8/+69 |
|\ \ | |/ | |||||
| * | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 1 | -8/+69 |
* | | after merge fix. | Sergei Golubchik | 2010-06-07 | 1 | -0/+35 |
* | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -12/+558 |
|\ \ | |/ | |||||
| * | Merge XtraDB 10 into MariaDB. | unknown | 2010-04-28 | 1 | -12/+558 |
* | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+689 |
|/ | |||||
* | Added missing space from last push | Michael Widenius | 2010-03-31 | 1 | -1/+0 |
* | Merge with fixes for compiler warnings and 2 fixed test cases | Michael Widenius | 2010-01-28 | 1 | -1/+1 |
* | Merge XtraDB 9 into MariaDB. | unknown | 2010-01-15 | 1 | -14/+183 |
* | Merge XtraDB 8 into MariaDB. | unknown | 2009-11-13 | 1 | -121/+122 |
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 |
|\ | |||||
| * | Trivial fixes for windows compile failures | Sergey Petrunya | 2009-09-01 | 1 | -2/+2 |
* | | Make MariaDB work on windows: | Sergey Petrunya | 2009-09-15 | 1 | -2/+2 |
|/ | |||||
* | Merge XtraDB 6 into MariaDB. | unknown | 2009-08-03 | 1 | -2/+301 |
* | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -4/+2 |
* | Import Percona XtraDB into the MariaDB source tree. | unknown | 2009-06-09 | 1 | -0/+2657 |