summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-021-1/+4
|\
| * MDEV-11741 handler::ha_reset(): Assertion `bitmap_is_set_all(&table->s->all_s...Sergei Golubchik2018-07-191-1/+4
* | Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-072-5/+7
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2018-04-202-8/+11
| |\
| * \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-04-031-1/+1
| |\ \
| * | | MDEV-15230: column_json breaks cyrillic in 10.1.31Oleksandr Byelkin2018-02-071-1/+1
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2018-02-021-1/+1
| |\ \ \
* | \ \ \ 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-4/+5
| | |\ \ \ \
| | | * | | | BUG#26502135: MYSQLD SEGFAULTS INKarthik Kamath2017-11-271-3/+4
| | * | | | | defaults-group-suffix in print_defaultsDaniel Black2018-04-131-4/+6
| | | |_|_|/ | | |/| | |
| | * | | | compiler warningSergei Golubchik2018-04-031-1/+1
| | | |_|/ | | |/| |
| | * | | Fix an out of scope bzeroVicențiu Ciorbaru2018-01-301-1/+1
| * | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-246-49/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | improve ASAN instrumentation: MEM_ROOTSergei Golubchik2018-01-221-3/+6
| | * | | | | | | | | | | | | | | | Correct TRASH() macro usageSergei Golubchik2018-01-222-3/+1
| | * | | | | | | | | | | | | | | | MDEV-14229: Stack trace is not resolved for shared objectsVicențiu Ciorbaru2018-01-192-32/+67
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-01-181-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Bug#23072792 MYSQL_GROUP_SUFFIX DOES NOT WORKTor Didriksen2017-09-081-2/+2
| | | * | | | | | | | | | | | | | BUG#25451091:CREATE TABLE DATA DIRECTORY / INDEX DIRECTORYNisha Gopalakrishnan2017-05-121-3/+27
| | | * | | | | | | | | | | | | | Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLEJon Olav Hauglid2016-08-191-3/+9
| | | * | | | | | | | | | | | | | Bug#23251517: SEMISYNC REPLICATION HANGINGSujatha Sivakumar2016-05-132-16/+6
| | * | | | | | | | | | | | | | | MDEV-14469 build with cmake -DMYSQL_MAINTAINER_MODE=ON fails: 'readdir_r' is ...Sergei Golubchik2018-01-151-10/+0
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | MDEV-7533: COLUMN_JSON() doesn't escape control characters in string valuesOleksandr Byelkin2018-01-231-2/+58
| * | | | | | | | | | | | | | | MDEV-8949: COLUMN_CREATE unicode name breakageOleksandr Byelkin2017-11-141-2/+1
* | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-0/+10
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | MDEV-13691 : my_write() sets inappropriate errno for ERROR_FILE_SYSTEM_LIMITATONVladislav Vaintroub2017-08-311-1/+3
| * | | | | | | | | | | | | | Windows : Do not use CRT routine to dump memory leaks.Vladislav Vaintroub2017-08-241-1/+0
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-094-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-252-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | MDEV-8692 prefschema test failures on ARM (on Debian build system)Alexander Barkov2017-07-171-0/+25