summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-0718-95/+92
|\
| * Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-2458-396/+291
| |\
| | * Merge branch 'merge/merge-xtradb-5.5' into 5.5mariadb-5.5.60Sergei Golubchik2018-04-202-3/+3
| | |\
| | | * 5.5.59-38.11Sergei Golubchik2018-04-202-8/+11
| | * | BUG#27216817: INNODB: FAILING ASSERTION: PREBUILT->TABLE->N_MYSQL_HANDLES_OPE...Sergei Golubchik2018-04-194-0/+24
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-1/+3
| | |\ \
| | | * | (no commit message)Karthik Kamath2018-02-141-1/+3
| | * | | honor alignment rules and xtradb tooEugene Kosov2018-03-202-1/+9
| | * | | MDEV-15030 Add ASAN instrumentationEugene Kosov2018-03-191-0/+2
| | * | | MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_n...Sergei Golubchik2018-02-141-5/+5
| | * | | bug: ha_heap was unilaterally increasing reclengthSergei Golubchik2018-02-118-21/+14
| * | | | MDEV-8743: protect myisam/aria MYI with O_CLOEXECDaniel Black2018-03-022-4/+4
| * | | | MDEV-8743: O_CLOEXEC on innodb/xtradb temp filesDaniel Black2018-03-022-0/+8
| * | | | MDEV-8743: protect myisam/aria MYD files and aria log filesDaniel Black2018-03-024-8/+8
| * | | | MDEV-8743: use O_CLOEXEC (innodb/xtradb)Daniel Black2018-03-022-6/+6
| * | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-1944-156/+218
| |\ \ \ \
| * | | | | MW-402 cascading FK issues (5.5 version)sjaakola2017-10-192-7/+6
| * | | | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-1929-43/+61
| |\ \ \ \ \
| * | | | | | Remove unneeded code.mariadb-galera-5.5.57Jan Lindström2017-07-242-36/+0
| * | | | | | Apply galera patches to XtraDB storage engine and remove one debug output.Jan Lindström2017-07-244-20/+33
| * | | | | | Fix regression on galera.partition test case by commenting the problematic co...Jan Lindström2017-07-241-3/+12
| * | | | | | MDEV-10379: Failing assertion: xid_seqno > trx_sys_cur_xid_seqnoJan Lindström2017-07-242-40/+0
| * | | | | | MW-369 FK fixessjaakola2017-07-201-1/+3
| * | | | | | MW-322 Fix compilation error with debug buildTeemu Ollakka2017-07-201-2/+1
| * | | | | | Fix merge error and compiler warning.Jan Lindström2017-07-201-8/+5
| * | | | | | MW-369 - merged fix for FK issue from 5.6-v25 branchsjaakola2017-07-201-8/+13
| * | | | | | MW-322 - CTAS fix merged to 5.5-v25 branchsjaakola2017-07-201-27/+35
| * | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-2039-230/+272
| |\ \ \ \ \ \
| * | | | | | | Add tokudb_bugs test to disabled.mariadb-galera-5.5.56Sachin Setiya2017-05-031-1/+1
| * | | | | | | Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-032-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-1840-775/+668
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix compiler error on gcc 6.x and most of the compiler warnings.Jan Lindström2017-04-0557-195/+37
| * | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-273-19/+43
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lockJan Lindström2016-11-092-2/+0
| * | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-1411-50/+179
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-1024-75/+158
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-2323-514/+655
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-2513-64/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-1317-111/+175
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Refs codership/mysql-wsrep#221sjaakola2016-02-101-0/+4
| * | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-1028-492/+588
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-1315-97/+320
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | MDEV-8743: where O_CLOEXEC is available, use for innodb buf_dumpDaniel Black2018-03-152-2/+28
* | | | | | | | | | | | | | | | | | MDEV-8743: ib_logfile0 Use O_CLOEXEC so galera SST scripts don't get fdDaniel Black2018-03-021-1/+1
* | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-01329-3274/+6990
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove ut_win_init_time from innodbVicențiu Ciorbaru2018-01-253-32/+0
| * | | | | | | | | | | | | | | | | | Fix innodb compilation failure on WindowsVicențiu Ciorbaru2018-01-253-21/+14
| * | | | | | | | | | | | | | | | | | Remove xtradb "fragmentation-statistics" patchesVicențiu Ciorbaru2018-01-244-62/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2018-01-2424-66/+515
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | 5.6.38-83.0Vicențiu Ciorbaru2018-01-2334-99/+604