Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 303 | -767/+5124 |
* | merge. | Sergei Golubchik | 2010-11-25 | 878 | -1871/+248505 |
|\ | |||||
| * | Fixed LP bug #668644. | Igor Babaev | 2010-11-08 | 2 | -2/+72 |
| * | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -1/+1 |
| |\ | |||||
| | * | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -1/+1 |
| * | | | merge w/ 5.2 | Sergei Golubchik | 2010-11-02 | 4 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | 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 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Make the skip-on-windows check as the first one, as the master-slave include ... | unknown | 2010-10-26 | 1 | -1/+1 |
| * | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 66 | -375/+1137 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 66 | -375/+1137 |
| | |\ \ | | | |/ | |||||
| | | * | 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 | 3 | -87/+101 |
| | | |\ | |||||
| | | | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 3 | -87/+101 |
| | | * | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 62 | -287/+1035 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| * | | | | Make innodb_plugin testsuite not to use IndexConditionPushdown or DS-MRR | Sergey Petrunya | 2010-10-18 | 2 | -3/+13 |
| * | | | | 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 | 6 | -28/+11 |
| |/ / / / | |||||
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 586 | -14535/+32734 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 2 | -20/+20 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with 1.0.11-7 Pre-GA - 2010-09-09 | Michael Widenius | 2010-09-28 | 2 | -20/+20 |
| | * | | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data... | Michael Widenius | 2010-09-28 | 2 | -2/+3 |
| | * | | | fix the sphinx test suite to work when sphinxse is statically linked into the... | Sergei Golubchik | 2010-09-21 | 3 | -4/+3 |
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 1 | -8/+8 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Adjusted the results of pbxt.join_nested after the fix for bug 49600 | Igor Babaev | 2010-09-13 | 1 | -8/+8 |
| | * | | | fixes for make dist, 32-bit OS, and other buildbot failures | Sergei Golubchik | 2010-09-16 | 3 | -11/+12 |
| | * | | | oqgraph and sphinx on windows | Sergei Golubchik | 2010-09-15 | 2 | -2/+2 |
| | * | | | provide maria* aliases for aria* command-line options, | Sergei Golubchik | 2010-09-14 | 4 | -0/+124 |
| | * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 75 | -2187/+2187 |
| | * | | | add sphinx suite | Sergei Golubchik | 2010-09-12 | 5 | -0/+249 |
| | * | | | add suite.pm for oqgraph suite;fix suite.opt | Sergei Golubchik | 2010-09-12 | 6 | -8/+9 |
| | * | | | restore shifted error numbers | Sergei Golubchik | 2010-09-12 | 4 | -23/+23 |
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 70 | -147/+3064 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Automatic merge | Michael Widenius | 2010-09-07 | 2 | -8/+13 |
| | | |\ \ | |||||
| | | | * | | Fixed recovery bug where bitmap pages would not be correctly updated after pr... | Michael Widenius | 2010-09-07 | 2 | -8/+13 |
| | | * | | | Fixed failing test cases after update of xtradb | Michael Widenius | 2010-09-05 | 6 | -19/+898 |
| | | * | | | Result file update following XtraDB merge. | unknown | 2010-09-04 | 1 | -2/+4 |
| | | * | | | Merge XtraDB from Percona Server 5.1.49-12 into MariaDB. | unknown | 2010-09-04 | 31 | -9/+1805 |
| | | |\ \ \ | |||||
| | | | * | | | Enable tests that were previously disabled waiting for XtraDB merge. | unknown | 2010-09-03 | 2 | -9/+0 |
| | | | * | | | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 29 | -0/+1805 |
| | | * | | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -828/+0 |
| | | |/ / / | |||||
| | | * | | | Fixed failing tests | Michael Widenius | 2010-08-28 | 5 | -56/+64 |
| | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 26 | -62/+1119 |
| | | |\ \ | |||||
| | | * | | | mtr changes: | Sergei Golubchik | 2010-08-25 | 4 | -4/+2 |
| | * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed failing test | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
| | * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 77 | -78/+165 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | allow suite.pm to tell mtr to skip the suite | Sergei Golubchik | 2010-08-24 | 1 | -1/+3 |