Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 2 | -2/+4 |
|\ | |||||
| * | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 2 | -0/+2 |
| * | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 2 | -2/+2 |
* | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | Fixed compiler warnings | Michael Widenius | 2013-08-21 | 34 | -34/+34 |
* | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 81 | -1096/+3277 |
|\ \ | |||||
| * | | MDEV-4058 | unknown | 2013-06-27 | 2 | -10/+1 |
| * | | Fixed memory leaks. alias.test now runs clean with valgrind | Michael Widenius | 2013-06-20 | 8 | -8/+8 |
| * | | Fixed some memory leaks | Michael Widenius | 2013-06-19 | 2 | -2/+2 |
| * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 3 | -28/+3 |
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 81 | -1087/+3302 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | | | MDEV-4546 Perfschema unit tests to return non-zero on failure. | unknown | 2013-07-16 | 10 | -10/+12 |
* | | | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 1 | -1/+1 |
* | | | | | remove .THIS file | Sergei Golubchik | 2013-06-10 | 1 | -0/+0 |
* | | | | | Merge from 10.0-connect | Alexander Barkov | 2013-06-08 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixing the problem with my_bool_t defined two times. | Alexander Barkov | 2013-06-03 | 1 | -3/+1 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 3 | -8/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 3 | -8/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 3 | -8/+8 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCATED_MEMORY | Marc Alff | 2013-02-28 | 3 | -8/+8 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-18 | 10 | -13/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warnings and a not critical memory leak | Michael Widenius | 2013-04-17 | 11 | -15/+15 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -11/+0 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -11/+0 |
| * | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -0/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16060864 SEGMENTATION FAULT IN PERFORMANCE_SCHEMA WITH HISTORY SIZE 0 | Marc Alff | 2013-01-02 | 1 | -0/+6 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 4 | -5/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -1/+1 |
| * | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 2 | -3/+2 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+0 |
| |/ / | |||||
* | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_U... | Vladislav Vaintroub | 2012-10-30 | 1 | -1/+1 |
* | | | P_S test failures on 32-bit platforms: | Sergei Golubchik | 2012-10-29 | 1 | -1/+1 |
* | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -909/+0 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 7 | -1/+9 |
* | | | SQL syntax extended with START TRANSACTION READ ONLY|READ WRITE | Alexey Botchkov | 2012-08-25 | 2 | -267/+268 |
* | | | More fixes | Michael Widenius | 2012-08-17 | 4 | -2/+9 |
* | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 2 | -334/+336 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 162 | -2833/+35292 |
|/ / | |||||
* | | Fixed some simple warnings on Windows. | Vladislav Vaintroub | 2012-04-13 | 2 | -7/+5 |
* | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -19/+30 |
|\ \ | |/ | |||||
| * | Bug#13898343 THREAD LOOPS ENDLESSLY IN LF_PINBOX_PUT_PINS WHILE HOLDING | Marc Alff | 2012-03-28 | 1 | -19/+30 |