Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed compiler warnings & failing test cases | Michael Widenius | 2010-01-28 | 1 | -1/+3 |
* | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -1/+5 |
* | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -45/+41 |
|\ | |||||
| * | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -40/+167 |
| |\ | |||||
* | \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -40/+167 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | merge | Vladislav Vaintroub | 2009-11-03 | 1 | -24/+29 |
| |\ | |||||
| | * | merge | Georgi Kodinov | 2009-10-30 | 1 | -24/+28 |
| | * | merge from 5.1 main | Bjorn Munch | 2009-10-16 | 1 | -3/+17 |
| | |\ | |||||
| | * | | Bug #47218 mysqltest ignores "error" command inside if inside loop | Bjorn Munch | 2009-10-08 | 1 | -0/+1 |
| * | | | Bug #47423 mtr connects to wrong database | Vladislav Vaintroub | 2009-11-03 | 1 | -0/+57 |
| | |/ | |/| | |||||
| * | | Merge 5.0-bugteam-> 5.1-bugteam | Frazer Clement | 2009-10-08 | 1 | -3/+2 |
| * | | Merge 5.0-bugteam->5.1 bugteam | Frazer Clement | 2009-10-05 | 1 | -1/+11 |
| * | | automerge | Georgi Kodinov | 2009-09-23 | 1 | -1/+1 |
| * | | automerge | Georgi Kodinov | 2009-09-18 | 1 | -18/+71 |
| |\ \ | | |/ | |||||
| | * | second merge from main, with adaptions | Bjorn Munch | 2009-09-02 | 1 | -8/+7 |
| | |\ | |||||
| | * \ | first merge from main | Bjorn Munch | 2009-09-02 | 1 | -17/+21 |
| | |\ \ | |||||
| | * | | | Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works ... | Bjorn Munch | 2009-09-02 | 1 | -10/+46 |
| | * | | | merge | Bjorn Munch | 2009-09-01 | 1 | -2/+7 |
| | |\ \ \ | |||||
| | | * | | | Bug #39003 mtr's diff_files command failed in pushbuild without printing a re... | Bjorn Munch | 2009-08-19 | 1 | -2/+7 |
| | * | | | | Bug #46164 memory leak in mysqltest after parse error with --debug | Bjorn Munch | 2009-08-18 | 1 | -3/+4 |
| | |/ / / | |||||
| | * | | | Bug #44012 mtr: test cases that are not supposed to return output always fail | Bjorn Munch | 2009-08-11 | 1 | -3/+14 |
| * | | | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -1/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge with latest MariaDB 5.1 trunk. | unknown | 2009-10-15 | 1 | -3/+17 |
|\ \ \ \ | |||||
| * | | | | Implement mysqltest --enable_prepare_warnings to properly fix some test failu... | unknown | 2009-10-09 | 1 | -3/+17 |
* | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -8/+7 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -8/+7 |
| | |/ | |/| | |||||
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -22/+80 |
|\ \ \ | |/ / | |||||
| * | | Merge from 5.1 main. | Davi Arnaut | 2009-06-08 | 1 | -4/+56 |
| |\ \ | | |/ | |||||
| | * | merge from 5.1 main | Bjorn Munch | 2009-05-29 | 1 | -1/+3 |
| | |\ | |||||
| | * | | cherry picking fix for Bug #39542 from 6.0-runtime | Bjorn Munch | 2009-05-27 | 1 | -1/+40 |
| | * | | Bug #44964 mysqltest: connection <connection><some spaces>; fails now | Bjorn Munch | 2009-05-26 | 1 | -1/+1 |
| | * | | Bug #44922 mysqltest's query_get_value function can't work with queries conta... | Bjorn Munch | 2009-05-25 | 1 | -2/+15 |
| * | | | manual merge | Tatiana A. Nurnberg | 2009-06-06 | 1 | -17/+21 |
| | |/ | |/| | |||||
| * | | Various command-line utilities, including mysqlbinlog and mysqldump, don't | Jim Winstead | 2009-05-07 | 1 | -0/+2 |
| * | | Make SSL options appear in correct place in mysql_upgrade and mysqltest | Jim Winstead | 2009-04-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -15/+23 |
|\ \ | |/ | |||||
| * | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-03-24 | 1 | -2/+2 |
| * | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-03-23 | 1 | -12/+20 |
| |\ | |||||
| | * | Merge | Magnus Svensson | 2009-03-19 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Bug#43361 msyql_client_test output lost | Magnus Svensson | 2009-03-13 | 1 | -1/+2 |
| | * | | merge from main | Bjorn Munch | 2009-03-18 | 1 | -0/+14 |
| | |\ \ | |||||
| | * | | | Bug #43532 mtr should not rely on diff to report test results | Bjorn Munch | 2009-03-11 | 1 | -11/+18 |
| | | |/ | | |/| | |||||
| * | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -0/+14 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -8/+21 |
|\ \ \ | |||||
| * \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+14 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Modifications to MTR and mysqltest to improve feedback from the latter when | Rafal Somla | 2009-02-13 | 1 | -0/+14 |
| | |/ | |||||
| * | | Fix for BUG#43001 ""maria.maria-no-logging fails sporadically on valgrind in ... | Guilhem Bichot | 2009-03-16 | 1 | -8/+7 |
* | | | Merge with trunk | Michael Widenius | 2009-03-20 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | Add testing of extra port for pool-of-threads. | unknown | 2009-03-18 | 1 | -1/+8 |