Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -7/+34 |
|\ | |||||
| * | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -8/+35 |
| |\ | |||||
| | * | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -8/+35 |
| | |\ | |||||
| | | * | Merge the bug fixes into the push tree. | Joerg Bruehe | 2009-10-15 | 1 | -4/+5 |
| | | |\ | |||||
| | | | * | Fix Bug #47957 | Joerg Bruehe | 2009-10-09 | 1 | -4/+5 |
| | | * | | Raise version number after cloning 5.1.40 | unknown | 2009-10-06 | 1 | -1/+1 |
| | | |/ | |||||
| | | * | automerge | Georgi Kodinov | 2009-10-04 | 1 | -4/+10 |
| | | |\ | |||||
| | | | * | Upmerge 5.0-build -> 5.1-build. | Joerg Bruehe | 2009-09-28 | 1 | -1/+2 |
| | | | |\ | |||||
| | | | | * | Merge the fix for bug#47137 into 5.0-build | Joerg Bruehe | 2009-09-28 | 1 | -1/+2 |
| | | | | |\ | |||||
| | | | | | * | Fix bug#47137 | Joerg Bruehe | 2009-09-17 | 1 | -1/+2 |
| | | | | * | | Raise version number after cloning 5.0.86 | unknown | 2009-09-08 | 1 | -2/+2 |
| | | | | |/ | |||||
| | | | | * | Raise version number after cloning 5.0.85 | unknown | 2009-08-11 | 1 | -2/+2 |
| | | | | * | Raise version number after cloning 5.0.84 | unknown | 2009-07-07 | 1 | -2/+2 |
| | | | * | | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -3/+8 |
| | | * | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+17 |
| | | |/ / | |||||
| | | * | | Raise version number after cloning 5.1.39 | Jonathan Perkin | 2009-09-03 | 1 | -1/+1 |
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -1/+1 |
| * | | | | Bump revision number for MariaDB 5.1.39 release. | unknown | 2009-11-07 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -8/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automatic merge | Michael Widenius | 2009-10-23 | 1 | -6/+4 |
| |\ \ \ | |||||
| | * | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -6/+4 |
| * | | | | Merged with itself. Win! | Peter Lieverdink | 2009-10-16 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Typo fixes for "usefull" -> "useful". | Peter Lieverdink | 2009-10-01 | 1 | -1/+1 |
* | | | | | Fixed version number | Michael Widenius | 2009-10-23 | 1 | -1/+1 |
* | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -3/+14 |
|/ / / / | |||||
* | | | | Revert change of package name in configure.in, as it breaks too much stuff. | unknown | 2009-10-08 | 1 | -2/+2 |
* | | | | Fixes for package name change mysql -> mariadb. | unknown | 2009-10-08 | 1 | -1/+1 |
* | | | | Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) | Sergey Petrunya | 2009-10-07 | 1 | -0/+2 |
* | | | | Change naming of our package to mariadb rather than mysql. | unknown | 2009-10-07 | 1 | -2/+2 |
* | | | | Merge Monty's fixes from main into release branch. | unknown | 2009-10-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -1/+1 |
* | | | | Look for libreadline in the light location on *both* tests. | Peter Lieverdink | 2009-09-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | More after-merge fixes for MySQL 5.1.38 merge. | unknown | 2009-09-15 | 1 | -1/+1 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -6/+61 |
|\ \ \ | |/ / | |||||
| * | | Raise version number after cloning 5.1.38 | unknown | 2009-08-12 | 1 | -1/+1 |
| * | | Raise version number after cloning 5.1.37 | unknown | 2009-07-13 | 1 | -1/+1 |
| * | | Merge from main branch | Christoffer Hall | 2009-06-29 | 1 | -5/+19 |
| |\ \ | |||||
| | * \ | Automerge. | Alexey Kopytov | 2009-06-26 | 1 | -4/+18 |
| | |\ \ | |||||
| | | * \ | Automerge. | Alexey Kopytov | 2009-06-26 | 1 | -4/+18 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #41710: MySQL 5.1.30 crashes on the latest OpenSolaris 10 | Alexey Kopytov | 2009-06-18 | 1 | -4/+18 |
| | | | * | Raise version number after cloning 5.0.83 | unknown | 2009-05-29 | 1 | -2/+2 |
| | | | * | Raise version number after cloning 5.0.82 | unknown | 2009-05-07 | 1 | -2/+2 |
| | | | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -2/+39 |
| | | | |\ | |||||
| | | | | * | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -6/+30 |
| | | | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -4/+4 |
| | | | | |\ | |||||
| | | | | * | | Raise version number after cloning 5.0.75 | unknown | 2008-12-18 | 1 | -2/+2 |
| | | | | * | | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -33/+52 |
| | | | | |\ \ | |||||
| | | | | * | | | Raise version number after cloning 5.0.67 | Jonathan Perkin | 2008-07-16 | 1 | -2/+2 |
| | | | | * | | | Put version number back to 5.0.67 | Jonathan Perkin | 2008-07-16 | 1 | -2/+2 |
| | | | | * | | | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -2/+5 |
| | | | | |\ \ \ |