Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 18 | -18/+18 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 18 | -18/+18 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 18 | -18/+18 |
| | * | CRLF->LF | Sergei Golubchik | 2015-06-02 | 1 | -447/+447 |
* | | | MDEV-15448 Remove "innodb_additional_mem_pool_size" setting from my-innodb-he... | Elena Stepanova | 2018-03-03 | 1 | -2/+2 |
* | | | don't install same files twice | Sergei Golubchik | 2017-08-14 | 1 | -26/+32 |
|/ / | |||||
* | | fix sql-bench test-table-elimination view leak. see MDEV-10310 for details | Rik Prohaska | 2016-07-12 | 1 | -0/+1 |
* | | fix MDEV-7225. see https://jira.mariadb.org/browse/MDEV-72225 for details. | Rik Prohaska | 2016-07-12 | 1 | -0/+5 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -2/+2 |
* | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-7226 sql-bench test-table-elimination does not execute | Sergei Golubchik | 2015-01-19 | 1 | -1/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 7 | -687/+687 |
| | |\ | |||||
| | | * | Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT | Terje Rosten | 2014-06-25 | 7 | -687/+689 |
* | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) | Sergei Golubchik | 2014-10-11 | 1 | -8/+0 |
|/ / / | |||||
* | | | MDEV-4447 MariaDB sources should have unix-style line endings everywhere | Sergei Golubchik | 2014-02-27 | 7 | -1134/+1134 |
|/ / | |||||
* | | remove PBXT | Sergei Golubchik | 2013-08-30 | 1 | -5/+0 |
* | | merge Percona-Server-5.5.32-rel31.0.tar.gz | Sergei Golubchik | 2013-07-16 | 1 | -0/+0 |
* | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 4 | -19/+27 |
|\ \ | |/ | |||||
| * | Bug #13004581 BLACKHOLE BINARY LOG WITH ROW IGNORES UPDATE AND DELETE STATEM... | Bill Qu | 2013-04-27 | 3 | -0/+0 |
| * | Bug#16395606 SCRIPTS MISSING EXECUTE BIT | Tor Didriksen | 2013-04-10 | 1 | -19/+27 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -4/+5 |
|\ \ | |||||
| * | | MDEV-772, MDEV-744: Fix test-table-elimination script to work. | Sergey Petrunya | 2012-10-31 | 2 | -4/+7 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 17 | -51/+68 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 17 | -51/+68 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 17 | -51/+68 |
| | | |\ \ | |||||
| | | * | | | Use three digits after the decimal point for better resolution and comparabil... | Hakan Kuecuekyilmaz | 2010-11-29 | 1 | -1/+1 |
* | | | | | | LPBUG#886526: Add propoer shebang to scripts | Vladislav Vaintroub | 2011-12-27 | 1 | -0/+1 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 2 | -29/+43 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Updated crash-me for 5.3 | Michael Widenius | 2011-08-29 | 2 | -29/+43 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 17 | -51/+68 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 17 | -51/+68 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 17 | -51/+68 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 17 | -51/+68 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 3 | -1/+13 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2010-12-09 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | MWL#90: Subqueries: Inside-out execution for non-semijoin materialized subque... | Sergey Petrunya | 2010-05-25 | 1 | -0/+1 |
| | * | | | | | | Use three digits after the decimal point for better resolution and comparabil... | Hakan Kuecuekyilmaz | 2010-11-29 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Enable PBXT to be a transactional engine for sql-bench. | Hakan Kuecuekyilmaz | 2011-05-23 | 1 | -0/+11 |
| * | | | | | | Use three digits after the decimal point for better resolution and comparabil... | Hakan Kuecuekyilmaz | 2010-11-26 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 2 | -88/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 1 | -83/+0 |
| * | | | | | add missing COMPONENT to all CMake INSTALL commands | Vladislav Vaintroub | 2010-11-13 | 1 | -5/+5 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 13 | -42/+442 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| * | | | Added count of my_sync calls (to SHOW STATUS) | Michael Widenius | 2010-03-09 | 1 | -3/+24 |