Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -54/+127 |
|\ | |||||
| * | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -23/+43 |
| |\ | |||||
| | * | extended configure script to report plugin configuration summary. | Sergei Golubchik | 2010-09-21 | 1 | -18/+17 |
| | * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -9/+13 |
| | |\ | |||||
| | | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+13 |
| | | |\ | |||||
| | * | \ | Merge with 5.1 | Michael Widenius | 2010-08-06 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixed wrong AC_INIT | Michael Widenius | 2010-08-06 | 1 | -1/+1 |
| | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+14 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -4/+15 |
| | | |\ \ | |||||
| * | | | | | Merge with new queue code. | Michael Widenius | 2010-07-16 | 1 | -1/+1 |
| * | | | | | Fix windows build: provide log2 function if the system doesn't have it. | Sergey Petrunya | 2010-06-26 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -10/+16 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -4/+10 |
| | |\ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings | Michael Widenius | 2010-04-08 | 1 | -1/+1 |
| * | | | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -1/+1 |
| * | | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -2/+1 |
| * | | | | | | Fix merge errors in configure.in | unknown | 2010-03-18 | 1 | -4/+1 |
| * | | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -16/+28 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -15/+24 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -1/+1 |
| * | | | | | | | merged | Sergei Golubchik | 2010-02-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | hide nm warnings in configure | Sergei Golubchik | 2010-01-29 | 1 | -1/+1 |
| * | | | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -9/+7 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures. | unknown | 2010-01-17 | 1 | -7/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -7/+8 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | * | | | | | | | | Fixed that we use same flags when testing for assembler as by makefiles. | Michael Widenius | 2010-01-15 | 1 | -9/+1 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge MariaDB 5.1.41-rc release into main, bumping configure.in version number. | unknown | 2010-01-09 | 1 | -1/+1 |
| | * | | | | | | | Changed tag to RC. It's time. | Michael Widenius | 2009-12-23 | 1 | -1/+1 |
| * | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 |