summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing tests and compiler warningsbb-10.1-defaultMonty2015-08-1810-10/+22
* Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ...Monty2015-08-18180-6161/+6632
* MDEV-8475 stale .TMM file causes MyiSAM and Aria engine to stop serving the t...Monty2015-07-254-3/+132
* MDEV-5096 - Wrong error message on attempt to kill somebody else's query IDSergey Vojtovich2015-07-244-1/+44
* Merge branch 'bb-10.1-serg' into 10.1mariadb-10.1.6Sergei Golubchik2015-07-23333-2273/+11343
|\
| * compilation failures on WindowsSergei Golubchik2015-07-232-2/+7
| * fix for 32-bit testsSergei Golubchik2015-07-221-128/+128
| * MDEV-8508 mroonga fails embedded tests in 10.1Sergei Golubchik2015-07-202-2/+2
| * compiler warningSergei Golubchik2015-07-201-5/+6
| * Merge https://github.com/Kentoku/MariaDB/tree/10.1 into 10.1Sergei Golubchik2015-07-20329-2136/+11200
| |\
| | * Update Mroonga to the latest version on 2015-07-02T04:12:21+0900Kentoku SHIBA2015-07-02329-2136/+11200
| * | Null-merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-07-200-0/+0
| |\ \
| | * | MDEV-8383 : "GRANT role TO user" does not replicateNirbhay Choubey2015-07-103-0/+324
| | * | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| | * | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | * | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-246-7/+38
| | * | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-2313-25/+434
| | |\ \
| | | * | Update SELinux policy to allow UDP for multicast repl in galera.mariadb-galera-5.5.44Nirbhay Choubey2015-06-232-20/+30
| | | * | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-21211-4424/+6440
| | | |\ \
| | | * | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-197-23/+142
| | | * | | MDEV-6829 : SELinux/AppArmor policies for Galera serverNirbhay Choubey2015-06-186-0/+278
| | * | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-21406-4454/+7447
| | |\ \ \ \
| | * | | | | Remove duplicate script added due to bad merge.Nirbhay Choubey2015-06-211-26/+0
| | * | | | | MDEV-8239 : Idle threads post-execution end up in closing tables stateNirbhay Choubey2015-06-197-14/+14
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-024-10/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | MDEV-8208 : Sporadic SEGFAULT on startupNirbhay Choubey2015-05-241-0/+6
| | | * | | | MDEV-8166 : Adding index on new table from select crashes Galera clusterNirbhay Choubey2015-05-163-8/+56
| | * | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.19Nirbhay Choubey2015-05-141-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mysql-wsrep#38 : wsrep_sst_xtrabackup-v2 script causes innobackupex toNirbhay Choubey2015-05-141-1/+1
| | * | | | | Disabling some more sporadically failing galera tests.Nirbhay Choubey2015-05-142-0/+8
| | * | | | | Update galera/disabled.def & some more test fixes.Nirbhay Choubey2015-05-124-9/+8
| | * | | | | MDEV-8144 percona.innodb_sys_index test failsElena Stepanova2015-05-121-1/+1
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-05-126-17/+50
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for debug build failuremariadb-galera-5.5.43Nirbhay Choubey2015-05-121-5/+3
| | | * | | | Revert last commit.Nirbhay Choubey2015-05-121-1/+1
| | | * | | | Fix for build failure.Nirbhay Choubey2015-05-111-1/+1
| | | * | | | MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEWSergei Golubchik2015-05-093-1/+17
| | | * | | | Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-04188-1152/+5733
| | | |\ \ \ \
| | | * | | | | codership/mysql-wsrep#67 - total order isolation for FLUSHTeemu Ollakka2015-05-041-0/+15
| | | * | | | | refs codership/mysql-wsrep#60 explicit braces around empty bodyTeemu Ollakka2015-05-041-1/+3
| | | * | | | | refs codership/mysql-wsrep#55 - To avoid compiler warming:sjaakola2015-05-041-0/+4
| | | * | | | | refs #55 fixed debug build compilation errorsTeemu Ollakka2015-05-042-2/+2
| | | * | | | | Refs #25 - made sure signals that may be set to ignored in mysqld were set to...Alexey Yurchenko2015-05-041-1/+29
| | | * | | | | This commitAlexey Yurchenko2015-05-041-2/+3
| | | * | | | | Going more MTR-friendly - for SST prefer to use mysql client, mysqldump and m...Alexey Yurchenko2015-05-045-17/+42
| | | * | | | | refs #7 - handling lock queue granting in BF-BF conflict situationNirbhay Choubey2015-05-041-8/+16
| | | * | | | | refs #7 - handling lock queue granting in BF-BF conflict situationsjaakola2015-05-041-8/+16
| | | * | | | | Refs #8: [5.5] preserve gvwstate.dat for pc recovery featuredirtysalt2015-05-041-1/+1
| | | * | | | | MDEV-7995 : DMLs not getting replicated with log-bin=OFF & binlog-format != ROWNirbhay Choubey2015-04-224-11/+58
| | * | | | | | Fix for some more test failures.Nirbhay Choubey2015-05-1210-8/+14