Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 2 | -2/+5 |
|\ | |||||
| * | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+3 |
| * | Updated WSREP_PATCH_REVNO. | Nirbhay Choubey | 2014-03-25 | 1 | -1/+1 |
| * | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -1/+1 |
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 9 | -95/+131 |
|\ \ | |||||
| * | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 3 | -3/+18 |
| * | | MDEV-4447 MariaDB sources should have unix-style line endings everywhere | Sergei Golubchik | 2014-02-27 | 2 | -86/+86 |
| * | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 4 | -32/+120 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 4 | -32/+120 |
| | |\ \ | |||||
| | | * | | MDEV-5390 doesn't install on fedora if mysql is installed, part 2 | Sergei Golubchik | 2014-02-19 | 1 | -0/+6 |
| | | * | | RPM: | Sergei Golubchik | 2014-02-19 | 2 | -32/+109 |
| | | * | | RPM: fix alternative provides/obsoletes - put the correct architecture and ve... | Sergei Golubchik | 2014-02-17 | 1 | -6/+11 |
| | | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+1 |
| | | |\ \ | |||||
| | | | * | | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -2/+1 |
| | | * | | | Do not include .result~ files and such into packages | Elena Stepanova | 2014-02-10 | 1 | -0/+1 |
| * | | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -0/+2 |
| * | | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 2 | -4/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 2 | -4/+7 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Change our INSTALL_DEBUG_SYMBOLS cmake function to be less picky | Sergei Golubchik | 2014-01-23 | 1 | -2/+2 |
| | | * | | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -2/+5 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINED | Jon Olav Hauglid | 2013-10-21 | 1 | -2/+5 |
* | | | | | | Merging deb/rpm script changes from maria-5.5-galera. | Nirbhay Choubey | 2014-03-24 | 1 | -27/+128 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fixed install_macros.cmake to set the correct | Nirbhay Choubey | 2014-02-19 | 1 | -3/+2 |
* | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -16/+21 |
* | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 4 | -108/+32 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | use -visibility=hidden also for plugins linked statically into libmysqld | Sergei Golubchik | 2013-12-22 | 1 | -0/+1 |
| * | | | | use dynamic libaio for ha_xtradb.so | Sergei Golubchik | 2013-12-22 | 1 | -2/+2 |
| * | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 2 | -17/+29 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.5 merge | Sergei Golubchik | 2013-12-15 | 2 | -17/+29 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | install and package plugin suites. | Sergei Golubchik | 2013-11-27 | 2 | -17/+29 |
| * | | | | remove unused libevent (that was merged from 5.6 by mistake) | Sergei Golubchik | 2013-11-21 | 1 | -89/+0 |
* | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 10 | -26/+148 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | add missing plugins to deb packages | Sergei Golubchik | 2013-11-14 | 1 | -1/+1 |
| * | | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -0/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -0/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-5250 doesn't install on fedora if mysql is installed | Sergei Golubchik | 2013-11-07 | 1 | -0/+2 |
| * | | | | syntax error in the cmake file | Sergei Golubchik | 2013-11-02 | 1 | -1/+1 |
| * | | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 2 | -4/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 5.5->10.0-base | Igor Babaev | 2013-10-13 | 1 | -3/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-5076 : Build on FreeBSD - when looking for execinfo library, and execinf... | Vladislav Vaintroub | 2013-09-26 | 1 | -3/+4 |
| | * | | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 1 | -0/+1 |
| | * | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -1/+1 |
| * | | | | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -5/+18 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge 5.5 -> 10.0-base | unknown | 2013-09-25 | 1 | -5/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX. | Vladislav Vaintroub | 2013-09-24 | 1 | -4/+10 |
| | | * | | MDEV-5053 - fix cyclic dependency when building with Ninja CMake generator | Vladislav Vaintroub | 2013-09-23 | 1 | -1/+8 |
| * | | | | simplify CMakeLists.txt for cassandra/connect engines | Sergei Golubchik | 2013-09-25 | 2 | -3/+10 |
| * | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 8 | -19/+117 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.5.33a merge | Sergei Golubchik | 2013-09-20 | 1 | -3/+12 |
| | |\ \ \ | | | |/ / |