Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+7 |
* | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+2 |
|\ | |||||
| * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+2 |
| |\ | |||||
| | * | Placement change: | Joerg Bruehe | 2012-11-08 | 1 | -1/+1 |
| | * | Merge changes for ULN RPMs into main 5.5 | Joerg Bruehe | 2012-09-21 | 1 | -0/+1 |
| | |\ | |||||
| | | * | More changes to supporting the build of RPMs for ULN | Joerg Bruehe | 2012-06-11 | 1 | -0/+1 |
| | * | | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILD | Tor Didriksen | 2012-09-07 | 1 | -0/+1 |
* | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | upmerge 14035452 5.1 -> 5.5 | Bjorn Munch | 2012-07-19 | 1 | -0/+3 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Bug #14035452 - MODULARIZE MYSQL_CLIENT_TEST | Bjorn Munch | 2012-07-19 | 1 | -0/+3 |
* | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -0/+4 |
| | |\ \ \ | |||||
| | * | | | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-06-28 | 1 | -0/+1 |
* | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -9/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-439 cmake -DWITHOUT_SERVER does not work | Sergei Golubchik | 2012-08-23 | 1 | -9/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaio | Sergei Golubchik | 2012-06-06 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Switched off Maintainer mode by default as it gave wrong compiler warnings (a... | Michael Widenius | 2012-06-13 | 1 | -6/+8 |
|/ / / | |||||
* | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -48/+26 |
* | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
* | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -1/+13 |
|\ \ \ | |/ / | |||||
| * | | Bug#13551687 CMAKE GENERATED PROJECT FILES ALWAYS HAVE THE SAME NAME IN VISUA... | Tor Didriksen | 2012-01-16 | 1 | -1/+12 |
* | | | Merge MWL#192: non-blocking client library into MariaDB. | unknown | 2012-02-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -1/+1 |
| |\ \ \ | |||||
* | | | | | disable safemalloc for valgrind builds. | Sergei Golubchik | 2012-02-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+2 |
| | | | | * | | | | Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.e | Kent Boortz | 2009-12-11 | 1 | -0/+1 |
| * | | | | | | | | merge | Vladislav Vaintroub | 2011-10-12 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Add option to enable feedback plugin to the MSI installer. | Vladislav Vaintroub | 2011-10-12 | 1 | -0/+2 |
| * | | | | | | | | merge | Vladislav Vaintroub | 2011-10-11 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | merge | Vladislav Vaintroub | 2011-10-11 | 1 | -3/+0 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | remove unconditional SAFEMALLOC/SAFEMUTEX from debug flags | Vladislav Vaintroub | 2011-10-11 | 1 | -3/+0 |
| * | | | | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -21/+27 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -21/+27 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 1 | -21/+27 |
| | | * | | | | | Windows build : Make win\config.js optional in 5.1 | Vladislav Vaintroub | 2011-05-12 | 1 | -1/+92 |
* | | | | | | | | * remove WITH_DEBUG from CMakeLists.txt | Sergei Golubchik | 2011-12-15 | 1 | -79/+58 |
* | | | | | | | | new configure option: NOT_FOR_DISTRIBUTION | Sergei Golubchik | 2011-12-14 | 1 | -2/+9 |
* | | | | | | | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 1 | -1/+6 |
* | | | | | | | | build on windows | Sergei Golubchik | 2011-11-02 | 1 | -6/+1 |
* | | | | | | | | Fix debug build on Windows. | Vladislav Vaintroub | 2011-10-25 | 1 | -3/+5 |