Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -12/+9 |
|\ | |||||
| * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -12/+9 |
| |\ | |||||
| | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -12/+9 |
* | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -2/+2 |
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -34/+33 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -34/+33 |
| |\ \ | | |/ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -33/+32 |
* | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -1/+1 |
* | | | merged | Sergei Golubchik | 2010-06-16 | 1 | -12/+31 |
|\ \ \ | |/ / | |||||
| * | | mysqltest: use setenv, not putenv, to make gcov happy. | Sergei Golubchik | 2010-06-14 | 1 | -13/+31 |
| * | | Fixed some bugs in the Maria storage engine | Michael Widenius | 2010-06-14 | 1 | -0/+1 |
* | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -73/+247 |
|\ \ \ | |/ / | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -73/+247 |
| |\ \ | | |/ | |||||
| | * | Bug#37316: Anonymous error messages noticed sometimes, while running tests in... | Davi Arnaut | 2010-03-08 | 1 | -1/+1 |
| | * | merge from 5.1-mtr | Bjorn Munch | 2010-02-22 | 1 | -61/+233 |
| | |\ | |||||
| | | * | Bug #51135 Please increase the maximum number of connections allowed in mysql... | Bjorn Munch | 2010-02-17 | 1 | -10/+21 |
| | | * | Bug #50618 Please allow 'sleep $variable' in mtr | Bjorn Munch | 2010-02-09 | 1 | -5/+17 |
| | | * | Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be d... | Bjorn Munch | 2010-02-04 | 1 | -1/+78 |
| | | * | merge 49837 | Bjorn Munch | 2010-01-20 | 1 | -0/+4 |
| | | |\ | |||||
| | | | * | Bug #49837 mysqltest exec cannot handle multi-line command correctly | Bjorn Munch | 2010-01-20 | 1 | -0/+4 |
| | | * | | merge 48888 | Bjorn Munch | 2010-01-20 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | | * | | Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ~10... | Bjorn Munch | 2010-01-20 | 1 | -2/+2 |
| | | | |/ | |||||
| | | * | | Bug #49878 delimiter under false 'if' makes mysqltest test fail with 'Missing... | Bjorn Munch | 2010-01-20 | 1 | -1/+19 |
| | | * | | exporting server version and other as env var (bug#50471) | Bernd Ocklin | 2010-01-20 | 1 | -1/+8 |
| | | |/ | |||||
| | | * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' | Bjorn Munch | 2010-01-07 | 1 | -4/+3 |
| | | * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' | Bjorn Munch | 2010-01-06 | 1 | -0/+1 |
| | | * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' | Bjorn Munch | 2010-01-06 | 1 | -2/+12 |
| | | * | Bug #48863 mysql test: enable and disable case insensitive compare mode | Bjorn Munch | 2010-01-06 | 1 | -2/+24 |
| | | * | Merge from 5.1 main | Bjorn Munch | 2009-12-16 | 1 | -26/+84 |
| | | |\ | |||||
| | | * | | backport mysqltest send_eval from 42520 | Bjorn Munch | 2009-12-16 | 1 | -2/+4 |
| | | * | | Bug #48250 mysqtest_embedded can lock destroyed mutex | Bjorn Munch | 2009-11-26 | 1 | -4/+4 |
| | | * | | Bug #48671 mysqltest fails on 'perl' in file sourced inside 'while' | Bjorn Munch | 2009-11-11 | 1 | -32/+41 |
| | * | | | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -11/+12 |
| | | |/ | | |/| | |||||
| | * | | Post-merge fixes: fix typo and remove unused variables. | Davi Arnaut | 2009-11-21 | 1 | -4/+1 |
* | | | | bugfix: change_user should only take the password | Sergei Golubchik | 2010-02-19 | 1 | -4/+7 |
|/ / / | |||||
* | | | 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 |
| |\ \ | | |/ |