Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 430 | -8463/+7074 |
* | merge. | Sergei Golubchik | 2010-11-25 | 1379 | -5789/+327385 |
|\ | |||||
| * | Merge | Igor Babaev | 2010-11-09 | 2 | -2/+72 |
| |\ | |||||
| | * | Fixed LP bug #668644. | Igor Babaev | 2010-11-08 | 2 | -2/+72 |
| * | | Fixed LP BUG#615378 Incorrect processing of NULL result in Item_cache fixed. | unknown | 2010-11-09 | 2 | -0/+83 |
| |/ | |||||
| * | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 10 | -35/+200 |
| |\ | |||||
| | * | Automatic merge with MariaDB 5.1 | Michael Widenius | 2010-11-04 | 2 | -0/+29 |
| | |\ | |||||
| | | * | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread | unknown | 2010-11-03 | 2 | -0/+29 |
| | * | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 8 | -35/+171 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 8 | -35/+171 |
| * | | | Merge | Igor Babaev | 2010-11-02 | 2 | -0/+182 |
| |\ \ \ | |||||
| | * \ \ | Merge | Igor Babaev | 2010-11-02 | 7 | -6/+14 |
| | |\ \ \ | |||||
| | * | | | | Fixed LP bug #669420. | Igor Babaev | 2010-11-02 | 2 | -0/+183 |
| * | | | | | Removed empty lines. | Igor Babaev | 2010-11-02 | 1 | -4/+0 |
| | |/ / / | |/| | | | |||||
| * | | | | merge | Sergei Golubchik | 2010-11-02 | 7 | -6/+14 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | merge w/ 5.2 | Sergei Golubchik | 2010-11-02 | 7 | -6/+14 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | fix LIKE in a vcol function, broken by a fix for mysql bug#54568. | Sergei Golubchik | 2010-10-30 | 3 | -5/+5 |
| | | * | | merge w/ 5.1 | Sergei Golubchik | 2010-10-29 | 4 | -1/+9 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix test failure (timeout) in --valgrind tests in Buildbot. | unknown | 2010-10-27 | 2 | -0/+5 |
| | | | * | Make the skip-on-windows check as the first one, as the master-slave include ... | unknown | 2010-10-26 | 1 | -1/+1 |
| * | | | | Fixed bug #665049. | Igor Babaev | 2010-10-29 | 2 | -0/+394 |
| |/ / / | |||||
| * | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 116 | -555/+2139 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 113 | -554/+2133 |
| | |\ \ | | | |/ | |||||
| | | * | updated test results | Sergei Golubchik | 2010-10-20 | 1 | -1/+1 |
| | | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 4 | -90/+105 |
| | | |\ | |||||
| | | | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 4 | -90/+105 |
| | | | |\ | |||||
| | | * | \ | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 108 | -463/+2027 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM... | Sergei Golubchik | 2010-10-24 | 2 | -0/+5 |
| * | | | | | Fixed LP bug #613009 | unknown | 2010-10-27 | 2 | -2/+35 |
| * | | | | | Fixed LP bug #601156 | unknown | 2010-10-26 | 2 | -4/+44 |
| * | | | | | Fixed LP bug #609121 | unknown | 2010-10-25 | 2 | -0/+47 |
| * | | | | | Make innodb_plugin testsuite not to use IndexConditionPushdown or DS-MRR | Sergey Petrunya | 2010-10-18 | 2 | -3/+13 |
| * | | | | | # No BUG#, a case brought from 5.2's innodb_mysql_lock.test | Sergey Petrunya | 2010-10-18 | 5 | -0/+93 |
| * | | | | | Merge from mariadb-5.1 (through mariadb-5.2) | Igor Babaev | 2010-10-14 | 1 | -4/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge | Igor Babaev | 2010-10-14 | 1 | -4/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Reverted the MySQL fix for bug 51242 that was rejected once for mariadb-5.1.48 | Igor Babaev | 2010-10-14 | 1 | -4/+6 |
| * | | | | | Turned off the test case for bug 49322 when join_cache_level=6. | Igor Babaev | 2010-10-14 | 2 | -13/+17 |
| * | | | | | Merge-in Sanja's post-merge fix | Sergey Petrunya | 2010-10-14 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | version of mysqld changed. | unknown | 2010-10-13 | 1 | -2/+2 |
| * | | | | | | Merge MariaDB 5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-10-14 | 13 | -156/+192 |
| * | | | | | | More post-merge test result updates (2). | Sergey Petrunya | 2010-10-13 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | More post-merge test result updates | Sergey Petrunya | 2010-10-12 | 2 | -4/+4 |
| * | | | | | Post-merge test result fixes part#1 (checked) | Sergey Petrunya | 2010-10-12 | 4 | -30/+74 |
| * | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 866 | -18313/+34985 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 7 | -20/+312 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | merge | Sergei Golubchik | 2010-09-28 | 1 | -0/+10 |
| | | |\ \ \ | |||||
| | | | * | | | clarified mtr treatment of the --plugin-load option in the mysql-test/README.... | Sergei Golubchik | 2010-09-21 | 1 | -0/+10 |
| | | * | | | | Merge with 1.0.11-7 Pre-GA - 2010-09-09 | Michael Widenius | 2010-09-28 | 2 | -20/+20 |
| | | * | | | | Fixed bug #57024. | Igor Babaev | 2010-09-26 | 2 | -0/+103 |
| | | * | | | | Merge | Igor Babaev | 2010-09-25 | 2 | -13/+5 |
| | | |\ \ \ \ |