Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 11 | -15/+640 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -10/+10 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -10/+10 |
| | |\ | |||||
| * | \ | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 4 | -4/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Don't use deprecated --skip-locking option in example config files. | unknown | 2010-10-03 | 4 | -4/+4 |
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fixed test failure | Michael Widenius | 2010-08-30 | 1 | -0/+2 |
| * | | Fixed build & test failures in buildbot | Michael Widenius | 2010-08-28 | 1 | -1/+6 |
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+0 |
| |\ \ | |||||
| * | | | Fixed compilation failure and added some new suppressions | Michael Widenius | 2010-08-20 | 1 | -0/+2 |
| * | | | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -0/+2 |
| * | | | Fixed test case and compiler warnings | Michael Widenius | 2010-08-06 | 1 | -0/+5 |
| * | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -0/+1 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -13/+117 |
| |\ \ \ | | |/ / | |||||
| * | | | Fixed compiler warnings | Michael Widenius | 2010-06-16 | 1 | -1/+1 |
| * | | | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 1 | -1/+3 |
| * | | | Fixed build failures and compiler warning | Michael Widenius | 2010-05-14 | 1 | -0/+2 |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -196/+361 |
| |\ \ \ | |||||
| * | | | | Fixed suppression of compiler/test warnings | Michael Widenius | 2010-04-07 | 1 | -1/+1 |
| * | | | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -0/+1 |
| * | | | | Fixed wrong regexps | Michael Widenius | 2010-04-01 | 1 | -2/+2 |
| * | | | | Added missing space before :, which caused failuers in buildbot | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
| * | | | | Fixed compiler warnings | Michael Widenius | 2010-03-31 | 1 | -0/+6 |
| * | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -0/+11 |
| * | | | | Fixed random failure in test system | Michael Widenius | 2010-03-29 | 1 | -6/+7 |
| * | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -0/+5 |
| * | | | | Fix some compiler warnings seen in Buildbot. | unknown | 2010-03-10 | 1 | -1/+1 |
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 2 | -6/+26 |
| |\ \ \ \ | |||||
| * | | | | | Fixed compiler warnings & failing test cases | Michael Widenius | 2010-01-28 | 1 | -0/+10 |
| * | | | | | Merge with fixes for compiler warnings and 2 fixed test cases | Michael Widenius | 2010-01-28 | 1 | -0/+13 |
| * | | | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 1 | -0/+3 |
| * | | | | | Merge free documentation from MySQL 5.1.41 source tarball into MariaDB. | unknown | 2009-12-01 | 1 | -118/+333 |
| |\ \ \ \ \ | |||||
| | * | | | | | Imported MySQL documentation files from MySQL 5.1.41 source tarball | unknown | 2009-12-01 | 1 | -118/+333 |
| * | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+24 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Automatic merge | Michael Widenius | 2009-10-23 | 5 | -2/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 5 | -2/+15 |
| * | | | | | | | | | | Merge Peter Lieverdink's fixes: | unknown | 2009-10-23 | 1 | -2/+29 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Add `configtest' option to the init script to check for a valid my.cnf file. | Peter Lieverdink | 2009-10-16 | 1 | -2/+29 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | MBUG#452116: MariaDB: mysql_install_db causes server segfault | Sergey Petrunya | 2009-10-16 | 2 | -2/+2 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Fix some compiler warnings cause by GCC bug: http://gcc.gnu.org/bugzilla/show... | unknown | 2009-10-03 | 1 | -0/+3 |
| * | | | | | | | | MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-15 | 1 | -5/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 2 | -0/+124 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 2 | -0/+124 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | After-merge fixes for merge of MySQL-5.1.38. | unknown | 2009-09-11 | 1 | -1/+1 |
| * | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 8 | -73/+70 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Imported freely distributable documentation from upstream MySQL 5.1.34 source... | unknown | 2009-05-25 | 1 | -5/+160 |
| * | | | | | | | | | Merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix support-files/build-tags for newer bzr which do not default to --recursiv... | unknown | 2009-05-18 | 1 | -1/+1 |