Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge from mysql-5.1.38-release | Jonathan Perkin | 2009-09-03 | 1 | -6/+15 | |
| | |\ \ \ | ||||||
* | | \ \ \ | 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 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Disable ftexample to match other packages, ride previous changelog entry. | Jonathan Perkin | 2009-08-25 | 1 | -3/+2 | |
| * | | | | Tidy previous, put example storage engine back as it's used by tests. | Jonathan Perkin | 2009-08-24 | 1 | -5/+15 | |
| * | | | | Add conditionals for bundled zlib and innodb plugin | Jonathan Perkin | 2009-08-24 | 1 | -0/+24 | |
| * | | | | Apply patch from bug#46834 to install the test suite in RPMs. | Jonathan Perkin | 2009-08-21 | 1 | -1/+5 | |
| * | | | | Add plugins to RPMs. Disable example plugins. | Jonathan Perkin | 2009-08-21 | 1 | -0/+11 | |
* | | | | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | Apply changes from mysql-5.1.38-release clone: | Jonathan Perkin | 2009-08-24 | 1 | -1/+40 | |
| |/ / | ||||||
| * | | merge patch for bug#31785 | Daniel Fischer | 2009-07-02 | 1 | -5/+12 | |
| * | | automerge | Georgi Kodinov | 2009-06-12 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | fixed the build-tags command | Georgi Kodinov | 2009-06-12 | 1 | -1/+1 | |
| | * | Updates to build with community features enabled for community builds. | MySQL Build Team | 2009-05-20 | 1 | -0/+2 | |
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -13/+18 | |
| | |\ | ||||||
| | | * | Merge from Tim's 5.0.76-release tree to make 5.0.77 . | Chad MILLER | 2009-01-21 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 2 | -6/+49 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 5 | -0/+15 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 3 | -5/+38 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 3 | -3/+75 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -13/+24 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -13/+24 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -13/+24 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | specfile fixes | unknown | 2007-05-07 | 1 | -14/+19 | |
| | | | | | * | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -0/+6 | |
| | | | | | |\ \ \ \ \ \ | ||||||
| | * | | | | \ \ \ \ \ \ | Merge a polishing of an old bug fix, | Joerg Bruehe | 2009-03-30 | 1 | -5/+13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Bug#34521, removed a bunch of deprecated options from template my.cnf files. | Daniel Fischer | 2009-03-31 | 5 | -66/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Bug#34521, removed a bunch of deprecated options from template my.cnf files: | Daniel Fischer | 2009-03-31 | 5 | -77/+11 | |
| | |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | merged 5.1-main -> 5.1-pe-stage | Georgi Kodinov | 2009-03-09 | 2 | -6/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Backport from 6.0 fix for Bug#38249 | Davi Arnaut | 2009-02-12 | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Only specify the current year for the Sun product copyright | unknown | 2009-02-24 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | Insert current year as last copyright year for the product | unknown | 2009-02-24 | 2 | -6/+7 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | 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 | Kent Boortz | 2008-12-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / |