Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 2 | -5/+7 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 2 | -8/+11 |
| |\ | |||||
| * \ | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-04-03 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | MDEV-15230: column_json breaks cyrillic in 10.1.31 | Oleksandr Byelkin | 2018-02-07 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2018-02-02 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | 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 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -4/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#26502135: MYSQLD SEGFAULTS IN | Karthik Kamath | 2017-11-27 | 1 | -3/+4 |
| | * | | | | | defaults-group-suffix in print_defaults | Daniel Black | 2018-04-13 | 1 | -4/+6 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | compiler warning | Sergei Golubchik | 2018-04-03 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | Fix an out of scope bzero | Vicențiu Ciorbaru | 2018-01-30 | 1 | -1/+1 |
| * | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 6 | -49/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | improve ASAN instrumentation: MEM_ROOT | Sergei Golubchik | 2018-01-22 | 1 | -3/+6 |
| | * | | | | | | | | | | | | | | | | Correct TRASH() macro usage | Sergei Golubchik | 2018-01-22 | 2 | -3/+1 |
| | * | | | | | | | | | | | | | | | | MDEV-14229: Stack trace is not resolved for shared objects | Vicențiu Ciorbaru | 2018-01-19 | 2 | -32/+67 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-01-18 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Bug#23072792 MYSQL_GROUP_SUFFIX DOES NOT WORK | Tor Didriksen | 2017-09-08 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | | | BUG#25451091:CREATE TABLE DATA DIRECTORY / INDEX DIRECTORY | Nisha Gopalakrishnan | 2017-05-12 | 1 | -3/+27 |
| | | * | | | | | | | | | | | | | | Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLE | Jon Olav Hauglid | 2016-08-19 | 1 | -3/+9 |
| | | * | | | | | | | | | | | | | | Bug#23251517: SEMISYNC REPLICATION HANGING | Sujatha Sivakumar | 2016-05-13 | 2 | -16/+6 |
| | * | | | | | | | | | | | | | | | MDEV-14469 build with cmake -DMYSQL_MAINTAINER_MODE=ON fails: 'readdir_r' is ... | Sergei Golubchik | 2018-01-15 | 1 | -10/+0 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | MDEV-7533: COLUMN_JSON() doesn't escape control characters in string values | Oleksandr Byelkin | 2018-01-23 | 1 | -2/+58 |
| * | | | | | | | | | | | | | | | MDEV-8949: COLUMN_CREATE unicode name breakage | Oleksandr Byelkin | 2017-11-14 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -0/+10 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | MDEV-13691 : my_write() sets inappropriate errno for ERROR_FILE_SYSTEM_LIMITATON | Vladislav Vaintroub | 2017-08-31 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | Windows : Do not use CRT routine to dump memory leaks. | Vladislav Vaintroub | 2017-08-24 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 4 | -4/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | MDEV-8692 prefschema test failures on ARM (on Debian build system) | Alexander Barkov | 2017-07-17 | 1 | -0/+25 |
| | * | | | | | | | | | | | | | MDEV-12144 Signal 6 crash corrupts ibd files | Sergei Golubchik | 2017-07-15 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-06-20 | 2 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / |