summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-24673-12629/+35419
| | |\ \ \ \ \ \ \
| | * | | | | | | | MDEV-9083: Slave IO thread does not handle autoreconnect to restarting Galera...Nirbhay Choubey2016-06-124-0/+75
| * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-28654-12380/+30522
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-06-282-42/+50
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MDEV-10050: Crash in subselectOleksandr Byelkin2016-06-242-42/+50
| | | * | | | | | | | MDEV-10083: Orphan ibd file when playing with foreign keysJan Lindström2016-06-2314-32/+257
| | * | | | | | | | | remove incorrect .gitattributesSergei Golubchik2016-06-281-25/+0
| | * | | | | | | | | bump the VERSIONDaniel Bartholomew2016-06-241-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed testcase check failure after db938.testmariadb-10.0.26Sergey Vojtovich2016-06-232-0/+2
| | * | | | | | | | MDEV-9728 - Hard crash in metadata_lock_infoSergey Vojtovich2016-06-236-49/+42
| | * | | | | | | | MDEV-9728 - Hard crash in metadata_lock_infoSergey Vojtovich2016-06-232-115/+54
| | * | | | | | | | Merge following commit from 5.5:Jan Lindström2016-06-2316-42/+272
| | * | | | | | | | compilation failuresSergei Golubchik2016-06-222-5/+13
| | * | | | | | | | MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+Dimitri John Ledkov2016-06-221-1/+1
| | * | | | | | | | MDEV-8638: REVOKE ALL PRIVILEGES, GRANT OPTION FROM CURRENT_ROLE breaks repli...Vicențiu Ciorbaru2016-06-223-2/+50
| | * | | | | | | | [MDEV-9614] Roles and Users longer than 6 charactersIgor Pashev2016-06-223-7/+183
| | * | | | | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-22620-12438/+34380
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed for failures in buildbot: TokuDBSergei Golubchik2016-06-221-0/+2
| | | * | | | | | | | Fixed for failures in buildbot: ReplicationSergei Golubchik2016-06-224-12/+9
| | | * | | | | | | | Fixed for failures in buildbot: WindowsSergei Golubchik2016-06-221-2/+2
| | | * | | | | | | | Merge branch 'merge-pcre' into 10.0Sergei Golubchik2016-06-2131-2141/+3492
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | 8.39Sergei Golubchik2016-06-2158-4367/+5786
| | | * | | | | | | | | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-06-2141-236/+8781
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-06-2020-56/+325
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-1318-11/+1144
| | | | * | | | | | | | | | git90.msg + git91.msgOlivier Bertrand2016-06-0213-74/+2039
| | | | * | | | | | | | | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-233-78/+157
| | | | * | | | | | | | | | Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-05-224669-315406/+747665
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-05-215-333/+454
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | | | * | | | | | | | | | | Commit changes made from 10.1Olivier Bertrand2016-05-215-332/+453
| | | | * | | | | | | | | | | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-05-1318-171/+5424
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | Add forgotten changes made on 10.1Olivier Bertrand2016-05-124-12/+26
| | | | | * | | | | | | | | | | Add all changes made on 10.1Olivier Bertrand2016-05-1214-159/+5398
| | | * | | | | | | | | | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-21547-10054/+22098
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-06-214-0/+323
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | 5.6.31Sergei Golubchik2016-06-213-22/+22
| | | | | * | | | | | | | | | | | | 5.6.30Sergei Golubchik2016-04-264-0/+322
| | | | * | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-2140-1032/+762
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | 5.6.30-76.3Sergei Golubchik2016-06-2140-1006/+765
| | | | * | | | | | | | | | | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-21146-1481/+1541
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | 5.6.31Sergei Golubchik2016-06-21146-1481/+1536
| | | | * | | | | | | | | | | | | | | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-2184-1007/+1405
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | fix a mysql-5.5.50 merge: mysqlcheckSergei Golubchik2016-06-203-2/+12
| | | | | * | | | | | | | | | | | | | | MDEV-9749 InnoDB receives 'Bad file descriptor' error, possibly related to fe...Sergei Golubchik2016-06-201-0/+1
| | | | | * | | | | | | | | | | | | | | MDEV-10043 - main.events_restart fails sporadically in buildbot (crashes uponSergey Vojtovich2016-06-201-26/+7
| | | | | * | | | | | | | | | | | | | | bump the VERSIONDaniel Bartholomew2016-06-171-1/+1
| | | | | * | | | | | | | | | | | | | | MDEV-10247 TokuDB assertion error when building with DEBUGVicențiu Ciorbaru2016-06-171-3/+12
| | | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Fix typo bug that cause myisam repair to failmariadb-5.5.50Vicențiu Ciorbaru2016-06-162-3/+3
| | | | | * | | | | | | | | | | | | | Increase the number of default build thread ids possibilitiesVicențiu Ciorbaru2016-06-161-1/+1