summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-1968-845/+1364
|\
| * Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-19193-3008/+43237
| |\
| | * Revert d9bc5e03d788b958ce8c76e157239953db60adb2 from Oracle (in XtraDB)Vicențiu Ciorbaru2017-09-193-33/+5
| | * Revert Bug #25175249 ASSERTION: (TEMPL->IS_VIRTUAL && !FIELD) || (FIELD && F...Vicențiu Ciorbaru2017-09-191-20/+3
| | * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-09-198-35/+147
| | |\
| | | * 5.6.37-82.2Vicențiu Ciorbaru2017-09-198-55/+179
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-09-1910-366/+100
| | |\ \
| | | * | 5.6.37-82.2Vicențiu Ciorbaru2017-09-1910-348/+100
| | * | | Fix fall-through warningVicențiu Ciorbaru2017-09-191-1/+1
| | * | | Fix connect merge problemsVicențiu Ciorbaru2017-09-194-51/+9
| | * | | Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-09-19149-3188/+42806
| | * | | Fix merge errorVicențiu Ciorbaru2017-09-191-2/+2
| | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-09-1910-26/+79
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | | |\ \ \
| | | | * | | 5.5.57-38.9merge-xtradb-5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | | * | | | Do not stop repeating a test even if some executions are skippedElena Stepanova2017-08-181-2/+1
| | | * | | | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-...Oleksandr Byelkin2017-08-163-9/+3
| | | * | | | MTR's internal check of main.log_tables-big failedElena Stepanova2017-08-152-8/+10
| | | * | | | MDEV-13458: Wrong result for aggregate function with distinct clause when the...Varun Gupta2017-08-094-5/+63
| | * | | | | Windows : support vsjitdebugger in MTR's --debugger.Vladislav Vaintroub2017-09-151-1/+1
| | * | | | | Windows : fix a warning in popular header fileVladislav Vaintroub2017-09-152-2/+2
| | * | | | | MDEV-13685 Can not replay binary log due to Illegal mix of collations (latin1...Alexander Barkov2017-09-155-1/+84
| | * | | | | Merge branch 'bb-10.0-wlad' into 10.0Vladislav Vaintroub2017-09-0913-119/+103
| | |\ \ \ \ \
| | | * | | | | Build improvements and cleanups.Vladislav Vaintroub2017-09-0813-119/+103
| * | | | | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-09-191-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix test failures on embedded server.Jan Lindström2017-08-319-31/+41
| * | | | | | | | MDEV-12893 innodb.log_data_file_size failed in buildbot with InnoDB: Database...Marko Mäkelä2017-09-181-0/+3
| * | | | | | | | MDEV-13157 Specifying DATA DIRECTORY in tables leads to failing EXCHANGE PART...Sergei Golubchik2017-09-187-13/+17
| * | | | | | | | cleanup parts.partition_exch_* testsSergei Golubchik2017-09-1814-298/+838
| * | | | | | | | MDEV-13208 Cannot import libmariadbclient.so.18 from pythonSergei Golubchik2017-09-181-0/+3
| * | | | | | | | MDEV-13636 ALTER TABLE ... DELAY_KEY_WRITE=1 creates table copy for MyISAM ta...Sergei Golubchik2017-09-183-2/+50
| * | | | | | | | MDEV-13650 Backport fix for MDEV-13060 (crash when both AWS plugin and server...Sergei Golubchik2017-09-181-3/+3
* | | | | | | | | apparmor: allow to read /etc/mysql/mariadb.conf.d/*Guido Günther2017-09-181-0/+2
* | | | | | | | | Merge pull request #446 from darkain/patch-1Jan Lindström2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes Galera on FreeBSDVincent Milum Jr2017-09-131-1/+1
* | | | | | | | | | MDEV-13751 Interrupted SELECT fails with 1030: 'Got error 1 "Operation not pe...Sergei Golubchik2017-09-183-4/+50
* | | | | | | | | | MDEV-13712 Spelling errors in the error messageSergei Golubchik2017-09-188-36/+36
* | | | | | | | | | MDEV-13698 stack overflow (OpenSSL on Windows)Sergei Golubchik2017-09-181-1/+1
* | | | | | | | | | MDEV-13708 Crash with indexed virtual columns and FK cascading deletesSergei Golubchik2017-09-184-2/+30
* | | | | | | | | | MDEV-13673 Bad result in viewSergei Golubchik2017-09-186-4/+15
* | | | | | | | | | MDEV-13623 Assertion `!table || (!table->read_set || bitmap_is_set(table->rea...Sergei Golubchik2017-09-183-0/+44
* | | | | | | | | | MDEV-13596 CHECK constraints disallow NULL to pass through, violating SQLSergei Golubchik2017-09-183-1/+23
* | | | | | | | | | MDEV-12951 Server crash [mysqld got exception 0xc0000005]Sergei Golubchik2017-09-183-2/+41
* | | | | | | | | | cleanup: remove dead codeSergei Golubchik2017-09-181-60/+0
* | | | | | | | | | bugfix: mtr non-reliable failure detectionSergei Golubchik2017-09-181-1/+1
* | | | | | | | | | bugfix: deadlock on shutdownSergei Golubchik2017-09-181-2/+8
* | | | | | | | | | cleanupSergei Golubchik2017-09-186-31/+44
* | | | | | | | | | compiler warningSergei Golubchik2017-09-181-1/+1
* | | | | | | | | | bugfix: TIME_FORMAT() should be ok in stored generated columnsSergei Golubchik2017-09-183-0/+23
* | | | | | | | | | bugfix: TIME_FORMAT() allowed some non-time format specifiersSergei Golubchik2017-09-185-8/+44