Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.4 into 10.5 | Marko Mäkelä | 2022-07-27 | 2 | -12/+12 |
|\ | |||||
| * | MDEV-28931 --verbose option is too verbose | Aleksey Midenkov | 2022-07-18 | 2 | -12/+12 |
* | | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-10-21 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | MDEV-19129: Xcode compatibility update: mysql-test-run.pl: rename $opt_vs_con... | Sergei Krivonos | 2021-10-21 | 1 | -4/+4 |
* | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-07-02 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2bb-10.2-merge | Marko Mäkelä | 2020-07-01 | 1 | -1/+1 |
| |\ | |||||
| | * | mtr: use env for perl | Daniel Black | 2020-06-23 | 1 | -1/+1 |
* | | | MDEV-22569: Run bin/mariadbd instead of bin/mysqld | Otto Kekäläinen | 2020-06-16 | 1 | -19/+18 |
|/ / | |||||
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 14 | -14/+14 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 14 | -14/+14 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 14 | -14/+14 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-07 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-11-07 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-11-07 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | test framework manual is moved | Takashi Sasaki | 2018-11-01 | 1 | -1/+1 |
* | | | | MDEV-7660 - MySQL WL#6671 "Improve scalability by not using thr_lock.c locks | Sergey Vojtovich | 2016-11-03 | 1 | -3/+0 |
* | | | | various cleanups | Michael Widenius | 2016-06-30 | 1 | -1/+1 |
* | | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) | Sergei Golubchik | 2014-10-11 | 6 | -1450/+3 |
|/ / | |||||
* | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+1 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -1/+1 |
| | |\ | |||||
| | | * | upmerge bug 17035577 5.1 => 5.5 | sayantan dutta | 2013-07-17 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug #17035577 - MTR V1 FAILS TO START SERVER MTR_VERSION=1 PERL MYSQL-TEST-RU... | sayantan dutta | 2013-07-17 | 1 | -1/+1 |
| | | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -7/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -7/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -7/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #16401597 - MTR V1 RETURNS INCORRECT PATH TO VARIABLE @@BASEDIR | sayantan dutta | 2013-04-04 | 1 | -7/+4 |
* | | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-03 | 1 | -5/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Instead of writing "Errcode" to the log for Slave errors, use "Internal Maria... | Michael Widenius | 2013-05-03 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -0/+2 |
* | | | | MDEV-3820 MTR1 produces bootstrap SQL file with wrong syntax, server bootstra... | Sergei Golubchik | 2012-10-29 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix RQG in 5.5, make mtr MTR_VERSION=1 functional. | Vladislav Vaintroub | 2011-12-27 | 1 | -1/+1 |
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -4/+10 |
|\ \ \ | |||||
| * | | | Fixed that test doesn't abort if 'var' points to a deleted directory (common ... | Michael Widenius | 2011-11-04 | 1 | -4/+10 |
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 14 | -13/+52 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -13/+52 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -13/+56 |
| * | | | BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb sui... | Anitha Gopi | 2010-12-21 | 1 | -1/+1 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | lp:731103 Assertion `maybe_null && item->null_value' failed with ORDER BY LAS... | Sergei Golubchik | 2011-03-08 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Don't delete directory mysql-test/var if we use mysql-test-run --vardir= | Michael Widenius | 2011-02-03 | 1 | -2/+2 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 3 | -62/+174 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | |