Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 18 | -15/+24 |
|\ | |||||
| * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 18 | -15/+24 |
| |\ | |||||
| | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 20 | -15/+26 |
* | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX. | Vladislav Vaintroub | 2013-09-24 | 1 | -1/+1 |
* | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 2 | -32/+8 |
|\ \ \ | |/ / | |||||
| * | | fix BUILD/compile-solaris-amd64 to produce working binaries | Sergei Golubchik | 2013-09-13 | 1 | -5/+5 |
| * | | tokudb buildbot fixes | Sergei Golubchik | 2013-09-12 | 1 | -30/+6 |
| * | | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
* | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 35 | -40/+41 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 35 | -40/+41 |
| |\ \ | | |/ | |||||
| | * | Correcting the permissions of the executable files. | Murthy Narkedimilli | 2013-03-20 | 37 | -0/+0 |
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 41 | -48/+48 |
* | | | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 16 | -17/+28 |
|\ \ \ | |/ / | |||||
| * | | - Solaris fixes: | Michael Widenius | 2013-05-15 | 2 | -3/+2 |
| * | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 14 | -14/+26 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 18 | -18/+34 |
| | |\ | |||||
| | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 23 | -23/+23 |
* | | | | wsrep build scripts | Seppo Jaakola | 2013-02-06 | 4 | -0/+0 |
* | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 2 | -1/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 2 | -1/+14 |
* | | | | fixes for the merge with codership-mysql, revision 3839 | Seppo Jaakola | 2013-02-05 | 1 | -0/+0 |
* | | | | remerging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 5 | -0/+71 |
* | | | | re-merging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 5 | -71/+0 |
* | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 1 | -0/+6 |
* | | | | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 | Seppo Jaakola | 2012-04-26 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Cleanups: | Michael Widenius | 2012-03-20 | 1 | -0/+1 |
* | | | | Added wsrep specific files | Seppo Jaakola | 2012-04-26 | 5 | -0/+71 |
* | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | disable safemalloc for valgrind builds. | Sergei Golubchik | 2012-02-23 | 1 | -1/+0 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 9 | -2/+120 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 10 | -3/+156 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 10 | -3/+156 |
| | |\ \ \ | |||||
| | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 10 | -3/+156 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | fixes for opensolaris compilation failures | Sergei Golubchik | 2012-01-05 | 1 | -1/+1 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 15 | -33/+34 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 20 | -44/+49 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 12 | -26/+32 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -7/+10 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 12 | -308/+123 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linking | Michael Widenius | 2011-03-31 | 6 | -6/+6 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 6 | -187/+127 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | merge | unknown | 2011-03-01 | 1 | -1/+2 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Fixed for mac sed. | unknown | 2011-03-01 | 1 | -1/+2 |
| | * | | | | | Merge with 5.1 | Michael Widenius | 2011-03-01 | 1 | -1/+17 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Allow -Wuninitialized without -O only for gcc 4.4 and upper | unknown | 2011-03-01 | 1 | -1/+17 |
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 6 | -187/+110 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fixed build failures | Michael Widenius | 2011-02-23 | 1 | -1/+0 |
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 5 | -180/+101 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | |