Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 77 | -153/+6163 |
|\ | |||||
| * | 5.2 merge | Sergei Golubchik | 2010-10-28 | 4 | -5/+12 |
| |\ | |||||
| | * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 4 | -5/+12 |
| | |\ | |||||
| | | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 1 | -3/+4 |
| | | |\ | |||||
| | | | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 1 | -3/+4 |
| | | * | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 3 | -2/+8 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 65 | -136/+1014 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 8 | -1/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | mysqltest now gives error messages with error code for my_delete, my_rename, ... | Michael Widenius | 2010-09-15 | 8 | -1/+18 |
| | * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 4 | -30/+31 |
| | |/ / | |||||
| | * | | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 3 | -0/+27 |
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 3 | -13/+44 |
| | |\ \ | |||||
| | * | | | mtr changes: | Sergei Golubchik | 2010-08-25 | 5 | -8/+15 |
| | * | | | generalization of mtr to support suite.pm extensions: | Sergei Golubchik | 2010-08-17 | 13 | -17/+23 |
| | * | | | Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47) | Michael Widenius | 2010-08-05 | 6 | -0/+130 |
| | |\ \ \ | |||||
| | | * | | | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 6 | -0/+130 |
| | * | | | | Fixes to allow one to compile and test innodb_plugin | Michael Widenius | 2010-08-04 | 3 | -1/+9 |
| | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 22 | -57/+708 |
| | |\ \ \ | |||||
| | * | | | | fixed for mysql-test-run to | Sergei Golubchik | 2010-06-10 | 4 | -10/+10 |
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 8 | -7/+110 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 2 | -0/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 5 | -1/+94 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -5/+9 |
| | * | | | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -1/+1 |
| * | | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 36 | -96/+148 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 4 | -2/+55 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix Windows test failures in binlog tests in certain time zones. | unknown | 2010-01-19 | 1 | -0/+3 |
| | * | | | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 17 | -76/+35 |
| | * | | | | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 13 | -18/+43 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 13 | -18/+43 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | XtraDB 8 after-merge fixes: fix forgotten manual merge of patch file. | unknown | 2009-11-14 | 1 | -0/+2 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | MWL#68 Subquery optimization: Efficient NOT IN execution with NULLs | unknown | 2010-03-11 | 1 | -0/+3 |
| * | | | | | | | | | | Merge | Igor Babaev | 2009-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -1/+1 |
| * | | | | | | | | | | | Added the include files needed for join_cache.test. | Igor Babaev | 2009-12-22 | 3 | -0/+5386 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+115 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge with latest MariaDB 5.1 trunk. | unknown | 2009-10-15 | 3 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Automatic merge with 5.1-merge | Michael Widenius | 2009-10-14 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Bug#37635: Test read_many_rows_innodb is failing w/ wrong error message (lock... | unknown | 2009-10-11 | 1 | -5/+5 |
| | * | | | | | | | | | | Force restart before maria_showlog_error to get rid of status from previous c... | Michael Widenius | 2009-10-13 | 2 | -2/+7 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 3 | -2/+106 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge fixes for --big tests and compiler warnings. | unknown | 2009-10-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Test suite fixes: | unknown | 2009-10-04 | 1 | -1/+1 |
| * | | | | | | | | | | | MBug#443092: test cases mysql and mysql_upgrade fails with wildcard DNS | unknown | 2009-10-05 | 1 | -0/+11 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | MySQL 5.1.38 after-merge fixes. | unknown | 2009-09-15 | 3 | -69/+4 |
| * | | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 16 | -45/+465 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | More XtraDB after-merge fixes following review and buildbot runs: | unknown | 2009-06-22 | 1 | -1/+3 |
| * | | | | | | | | | | | Fix test cases after merge of XtraDB into MariaDB. | unknown | 2009-06-18 | 1 | -0/+2 |
| * | | | | | | | | | | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ |