Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 18 | -95/+92 |
|\ | |||||
| * | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 58 | -396/+291 |
| |\ | |||||
| | * | Merge branch 'merge/merge-xtradb-5.5' into 5.5mariadb-5.5.60 | Sergei Golubchik | 2018-04-20 | 2 | -3/+3 |
| | |\ | |||||
| | | * | 5.5.59-38.11 | Sergei Golubchik | 2018-04-20 | 2 | -8/+11 |
| | * | | BUG#27216817: INNODB: FAILING ASSERTION: PREBUILT->TABLE->N_MYSQL_HANDLES_OPE... | Sergei Golubchik | 2018-04-19 | 4 | -0/+24 |
| | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * | | (no commit message) | Karthik Kamath | 2018-02-14 | 1 | -1/+3 |
| | * | | | honor alignment rules and xtradb too | Eugene Kosov | 2018-03-20 | 2 | -1/+9 |
| | * | | | MDEV-15030 Add ASAN instrumentation | Eugene Kosov | 2018-03-19 | 1 | -0/+2 |
| | * | | | MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_n... | Sergei Golubchik | 2018-02-14 | 1 | -5/+5 |
| | * | | | bug: ha_heap was unilaterally increasing reclength | Sergei Golubchik | 2018-02-11 | 8 | -21/+14 |
| * | | | | MDEV-8743: protect myisam/aria MYI with O_CLOEXEC | Daniel Black | 2018-03-02 | 2 | -4/+4 |
| * | | | | MDEV-8743: O_CLOEXEC on innodb/xtradb temp files | Daniel Black | 2018-03-02 | 2 | -0/+8 |
| * | | | | MDEV-8743: protect myisam/aria MYD files and aria log files | Daniel Black | 2018-03-02 | 4 | -8/+8 |
| * | | | | MDEV-8743: use O_CLOEXEC (innodb/xtradb) | Daniel Black | 2018-03-02 | 2 | -6/+6 |
| * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 44 | -156/+218 |
| |\ \ \ \ | |||||
| * | | | | | MW-402 cascading FK issues (5.5 version) | sjaakola | 2017-10-19 | 2 | -7/+6 |
| * | | | | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 29 | -43/+61 |
| |\ \ \ \ \ | |||||
| * | | | | | | Remove unneeded code.mariadb-galera-5.5.57 | Jan Lindström | 2017-07-24 | 2 | -36/+0 |
| * | | | | | | Apply galera patches to XtraDB storage engine and remove one debug output. | Jan Lindström | 2017-07-24 | 4 | -20/+33 |
| * | | | | | | Fix regression on galera.partition test case by commenting the problematic co... | Jan Lindström | 2017-07-24 | 1 | -3/+12 |
| * | | | | | | MDEV-10379: Failing assertion: xid_seqno > trx_sys_cur_xid_seqno | Jan Lindström | 2017-07-24 | 2 | -40/+0 |
| * | | | | | | MW-369 FK fixes | sjaakola | 2017-07-20 | 1 | -1/+3 |
| * | | | | | | MW-322 Fix compilation error with debug build | Teemu Ollakka | 2017-07-20 | 1 | -2/+1 |
| * | | | | | | Fix merge error and compiler warning. | Jan Lindström | 2017-07-20 | 1 | -8/+5 |
| * | | | | | | MW-369 - merged fix for FK issue from 5.6-v25 branch | sjaakola | 2017-07-20 | 1 | -8/+13 |
| * | | | | | | MW-322 - CTAS fix merged to 5.5-v25 branch | sjaakola | 2017-07-20 | 1 | -27/+35 |
| * | | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 39 | -230/+272 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add tokudb_bugs test to disabled.mariadb-galera-5.5.56 | Sachin Setiya | 2017-05-03 | 1 | -1/+1 |
| * | | | | | | | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 40 | -775/+668 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix compiler error on gcc 6.x and most of the compiler warnings. | Jan Lindström | 2017-04-05 | 57 | -195/+37 |
| * | | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 3 | -19/+43 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lock | Jan Lindström | 2016-11-09 | 2 | -2/+0 |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 11 | -50/+179 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 24 | -75/+158 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 23 | -514/+655 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 13 | -64/+103 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 17 | -111/+175 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Refs codership/mysql-wsrep#221 | sjaakola | 2016-02-10 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 28 | -492/+588 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 15 | -97/+320 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | MDEV-8743: where O_CLOEXEC is available, use for innodb buf_dump | Daniel Black | 2018-03-15 | 2 | -2/+28 |
* | | | | | | | | | | | | | | | | | | MDEV-8743: ib_logfile0 Use O_CLOEXEC so galera SST scripts don't get fd | Daniel Black | 2018-03-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 329 | -3274/+6990 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Remove ut_win_init_time from innodb | Vicențiu Ciorbaru | 2018-01-25 | 3 | -32/+0 |
| * | | | | | | | | | | | | | | | | | | Fix innodb compilation failure on Windows | Vicențiu Ciorbaru | 2018-01-25 | 3 | -21/+14 |
| * | | | | | | | | | | | | | | | | | | Remove xtradb "fragmentation-statistics" patches | Vicențiu Ciorbaru | 2018-01-24 | 4 | -62/+1 |
| * | | | | | | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 24 | -66/+515 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | 5.6.38-83.0 | Vicențiu Ciorbaru | 2018-01-23 | 34 | -99/+604 |