Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+5 |
|\ | |||||
| * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+5 |
| |\ | |||||
| | * | Fixed copyright headers in mtr src files | Bjorn Munch | 2011-01-18 | 1 | -5/+4 |
* | | | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -1/+1 |
* | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Merge | Kent Boortz | 2010-12-29 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -2/+2 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -2/+4 |
|/ / / / | |||||
* | | | | Automatic merge with 5.1 | Michael Widenius | 2011-01-10 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | - Fixed that Aria works with HANDLER commands | Michael Widenius | 2011-01-10 | 1 | -1/+1 |
* | | | | add sphinx suite | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -8/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Add the innodb_plugin tests to "make dist". | Vasil Dimov | 2010-07-07 | 1 | -0/+2 |
* | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | generalization of mtr to support suite.pm extensions: | Sergei Golubchik | 2010-08-17 | 1 | -2/+3 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix mysql-test/suite/percona missing from `make dist`. | unknown | 2010-08-04 | 1 | -0/+1 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run d... | sunanda | 2010-07-07 | 1 | -0/+1 |
| | |/ / | |||||
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Test suites for engine testing, moved from test-extra so will be available | Omer BarNir | 2010-03-17 | 1 | -1/+5 |
| | * | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-03-09 | 1 | -2/+2 |
| | * | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-02-12 | 1 | -2/+2 |
* | | | | Fix type in merge, breaking `make dist` for oqgraph. | unknown | 2010-03-31 | 1 | -1/+1 |
* | | | | Merge OQGraph into MariaDB 5.2. | unknown | 2010-03-31 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | OQGraph testsuite was forgotten from `make dist`. | unknown | 2010-03-30 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Fix merge errors in configure.in | unknown | 2010-03-18 | 1 | -1/+2 |
|/ / / | |||||
* | | | MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-15 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Apply patch from bug#46834 to install the test suite in RPMs. | Jonathan Perkin | 2009-08-21 | 1 | -1/+2 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -5/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -4/+3 |
| |\ \ | |||||
| | * | | The valgrind suppression file (valgrind.supp) must be added to | Davi Arnaut | 2009-06-05 | 1 | -4/+3 |
| * | | | Add innodb plugin tests to a new mysql test suite 'innodb'. | Satya B | 2009-06-10 | 1 | -1/+2 |
| |/ / | |||||
* | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+2 |
* | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -4/+4 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | merge from parent | Daniel Fischer | 2009-03-09 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Added to source package the file "mysql-test/suite/bugs/combinations" | MySQL Build Team | 2009-02-13 | 1 | -2/+2 |
| * | | | merge | Daniel Fischer | 2009-02-24 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | include collections in dist | Daniel Fischer | 2009-02-24 | 1 | -1/+2 |
| | * | Bug#36492: make dist and make install fails | Tatiana A. Nurnberg | 2008-06-17 | 1 | -2/+2 |
| | * | Backport of fix made in 5.1 to 5.0 | unknown | 2008-04-04 | 1 | -1/+1 |
| | * | Correct the location of the directory for | unknown | 2008-04-02 | 1 | -2/+2 |
| | * | Fix for | unknown | 2008-03-31 | 1 | -2/+6 |
| | * | Merge sita.local:/Users/tsmith/m/bk/50 | unknown | 2007-09-24 | 1 | -0/+1 |
| | |\ |