Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| * | | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 6 | -11/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 4 | -4/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 2 | -8/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 2 | -28/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 2 | -28/+69 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| / / / / / / / / / / / / | | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 6 | -14/+66 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 5 | -4/+49 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 9 | -8/+523 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | mysql.spec.sh: | unknown | 2008-02-21 | 1 | -20/+30 | |
| * | | | | | | | | | | | | | | | | Fixed compiler warnings by adding casts and changing variable types | unknown | 2008-01-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work | unknown | 2008-01-11 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 2 | -2/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 2 | -2/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-10-08 | 2 | -2/+18 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 2 | -2/+18 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-04 | 1 | -0/+5 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | | | | | | After merge fixes | unknown | 2007-07-01 | 1 | -0/+5 | |
| | | | | * | | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -2/+13 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | | | * | | | | | | | | | | | | | | | | Fixes after review of guilhem of block record patch | unknown | 2007-04-19 | 1 | -2/+2 | |
| | | | | | * | | | | | | | | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -2/+13 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | Postreview changes. | unknown | 2007-02-19 | 1 | -0/+7 | |
| | | | | | | * | | | | | | | | | | | | | | | | Merge with new version | unknown | 2007-01-23 | 1 | -2/+6 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | Implementation of rows-in-block | unknown | 2007-01-18 | 1 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-18 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-16 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |