Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compiler errors and warnings | Michael Widenius | 2013-12-02 | 1 | -1/+1 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 101 | -2/+45845 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 101 | -2/+45845 |
| |\ \ | | |/ | |||||
| | * | merge with 5.5-tokudb tree. In particular: | Sergei Golubchik | 2013-09-10 | 100 | -0/+45843 |
| | |\ | |||||
| | | * | merge in git://github.com/Tokutek/jemalloc | Sergei Golubchik | 2013-08-29 | 100 | -0/+45843 |
| | * | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error... | Sergei Golubchik | 2013-09-09 | 1 | -1/+0 |
| | * | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+2 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Merge from mysql-5.1 to mysql-5.5 | Jon Olav Hauglid | 2013-05-16 | 1 | -1/+19 |
| | | |\ | |||||
| | | | * | Bug#16807394: PREVENT NEW ERROR MESSAGES FROM BEING ADDED TO 5.5 | Jon Olav Hauglid | 2013-05-16 | 1 | -1/+19 |
| | | | * | Correcting the permissions of executable files. | Murthy Narkedimilli | 2013-03-20 | 6 | -0/+0 |
| | | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 17 | -19/+19 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 2 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 2 | -5/+8 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 9 | -11/+11 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 9 | -11/+11 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 9 | -11/+11 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Correcting the permissions of the executable files. | Murthy Narkedimilli | 2013-03-20 | 6 | -0/+0 |
| | | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 9 | -11/+11 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 71 | -103/+320 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 71 | -105/+320 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 73 | -107/+323 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 72 | -84/+74 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 77 | -89/+77 |
| | | * | | | Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THE | Harin Vadodaria | 2013-02-15 | 5 | -25/+215 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THE | Harin Vadodaria | 2013-02-15 | 5 | -25/+215 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -18/+38 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 2 | -18/+38 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-4068 rpm scriptlet chown command dangerous | Sergei Golubchik | 2013-03-06 | 1 | -17/+31 |
| | * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -1/+7 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTION | Harin Vadodaria | 2012-12-13 | 1 | -1/+7 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTION | Harin Vadodaria | 2012-12-13 | 1 | -1/+7 |
| | | | * | Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1 | Harin Vadodaria | 2012-11-21 | 16 | -35/+74 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 3 | -5/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 2 | -3/+3 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 3 | -5/+5 |
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -3/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -3/+0 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 9 | -253/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 8 | -252/+0 |
| * | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 19 | -77/+84 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 4 | -41/+5 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 4 | -41/+5 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 4 | -41/+5 |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
* | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 19 | -76/+83 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | merge | Sergei Golubchik | 2012-09-27 | 1 | -2/+6 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | |