summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Merge 10.0 into 10.1Marko Mäkelä2019-01-171-1/+1
| | |\ \ \ | | | |/ /
| | | * | safemalloc: warn, flush after fprintfDaniel Black2019-01-171-1/+1
* | | | | safemalloc: put bad_ptr error arguments in right orderDaniel Black2019-01-171-1/+1
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-072-7/+23
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-073-29/+49
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.0 into 10.1Marko Mäkelä2018-11-073-29/+49
| | |\ \ \ | | | |/ /
| | | * | Merge 5.5 into 10.0Marko Mäkelä2018-11-073-29/+49
| | | |\ \ | | | | |/
| | | | * MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF err...Oleksandr Byelkin2018-11-023-31/+51
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-064-4/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-064-4/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-303-2/+10
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-272-2/+3
| | | |\ \ | | | | |/
| | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-232-8/+10
| | | | |\
| | | | | * Bug#27788907 SOME FILE OPERATIONS IN MF_IOCACHE2.C ARE NOT INSTRUMENTEDmysql-5.5.62Marc Alff2018-08-201-8/+8
| | | | | * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-091-2/+2
| | | * | | MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with b...Varun Gupta2018-10-151-0/+7
| | * | | | MDEV-17133 dump thread reads from a past positionAndrei Elkin2018-10-211-2/+5
| * | | | | MDEV-12779 Oracle/DB2 Compatibility Implicit Ordering for ROW_NUMBER OVERVicențiu Ciorbaru2018-11-011-0/+9
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-09-241-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-09-231-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 5.5 into 10.0Marko Mäkelä2018-09-211-1/+2
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-17248 Improve ASAN memory pool instrumentationEugene Kosov2018-09-211-1/+2
* | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-031-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-251-1/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-11741 handler::ha_reset(): Assertion `bitmap_is_set_all(&table->s->all_s...Sergei Golubchik2018-07-191-1/+4
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-072-5/+7
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-074-7/+8
| | | |\ \ \ \
| | | | * \ \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-247-46/+85
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | MDEV-8743: use O_CLOEXEC MYSQL_LOG::open / TC_LOG_MMAP::openDaniel Black2018-03-021-1/+1
| | | | * | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-192-12/+3
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-0/+10
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-205-4/+38
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-032-9/+11
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-1814-85/+198
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-272-2/+83
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-141-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52Nirbhay Choubey2016-09-192-3/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-101-10/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-236-7/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-254-3/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-134-31/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-017-52/+135
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scriptsSergei Golubchik2018-01-141-25/+0
| | | * | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-033-2/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \