Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2019-01-17 | 1 | -1/+1 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | safemalloc: warn, flush after fprintf | Daniel Black | 2019-01-17 | 1 | -1/+1 | |
* | | | | | safemalloc: put bad_ptr error arguments in right order | Daniel Black | 2019-01-17 | 1 | -1/+1 | |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-07 | 2 | -7/+23 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-07 | 3 | -29/+49 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-11-07 | 3 | -29/+49 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-11-07 | 3 | -29/+49 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF err... | Oleksandr Byelkin | 2018-11-02 | 3 | -31/+51 | |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 4 | -4/+24 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 4 | -4/+15 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 3 | -2/+10 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 2 | -2/+3 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-10-23 | 2 | -8/+10 | |
| | | | |\ | ||||||
| | | | | * | Bug#27788907 SOME FILE OPERATIONS IN MF_IOCACHE2.C ARE NOT INSTRUMENTEDmysql-5.5.62 | Marc Alff | 2018-08-20 | 1 | -8/+8 | |
| | | | | * | Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIES | Aditya A | 2018-07-09 | 1 | -2/+2 | |
| | | * | | | MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with b... | Varun Gupta | 2018-10-15 | 1 | -0/+7 | |
| | * | | | | MDEV-17133 dump thread reads from a past position | Andrei Elkin | 2018-10-21 | 1 | -2/+5 | |
| * | | | | | MDEV-12779 Oracle/DB2 Compatibility Implicit Ordering for ROW_NUMBER OVER | Vicențiu Ciorbaru | 2018-11-01 | 1 | -0/+9 | |
* | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-09-24 | 1 | -1/+2 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-09-23 | 1 | -1/+2 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-09-21 | 1 | -1/+2 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | MDEV-17248 Improve ASAN memory pool instrumentation | Eugene Kosov | 2018-09-21 | 1 | -1/+2 | |
* | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-08-03 | 1 | -1/+4 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -1/+4 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge branch '10.0' into bb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-25 | 1 | -1/+4 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | MDEV-11741 handler::ha_reset(): Assertion `bitmap_is_set_all(&table->s->all_s... | Sergei Golubchik | 2018-07-19 | 1 | -1/+4 | |
* | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 2 | -5/+7 | |
| | | |\ \ \ \ | | | | |/ / / | ||||||
| | | * | | | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 4 | -7/+8 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 7 | -46/+85 | |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | ||||||
| | | | * | | | | MDEV-8743: use O_CLOEXEC MYSQL_LOG::open / TC_LOG_MMAP::open | Daniel Black | 2018-03-02 | 1 | -1/+1 | |
| | | | * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 2 | -12/+3 | |
| | | | |\ \ \ \ | ||||||
| | | | * \ \ \ \ | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -0/+10 | |
| | | | |\ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 5 | -4/+38 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 2 | -9/+11 | |
| | | | |\ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 14 | -85/+198 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 2 | -2/+83 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 1 | -3/+3 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52 | Nirbhay Choubey | 2016-09-19 | 2 | -3/+5 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -10/+7 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 6 | -7/+12 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 4 | -3/+10 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 4 | -31/+34 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 7 | -52/+135 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scripts | Sergei Golubchik | 2018-01-14 | 1 | -25/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 3 | -2/+13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |