summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4774 Fix BuildBot failure on x86 vmsbb-10.0-sachinSachin Setiya2017-01-282-42/+21
* Clean up a few tests that kill the server.Marko Mäkelä2017-01-277-75/+26
* MDEV-11814 test fixMarko Mäkelä2017-01-272-9/+7
* MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytesMarko Mäkelä2017-01-2713-108/+365
* MDEV-11915 Detect InnoDB system tablespace size mismatch earlyMarko Mäkelä2017-01-264-339/+182
* MDEV-11814 Refuse innodb_read_only startup if crash recovery is neededMarko Mäkelä2017-01-268-26/+299
* MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()...Varun Gupta2017-01-241-1/+1
* MDEV-4774 Strangeness with max_binlog_stmt_cache_size SettingsSachin Setiya2017-01-204-12/+114
* connect zip bug fixSergei Golubchik2017-01-171-1/+1
* Merge branch '5.5' into 10.0Sergei Golubchik2017-01-179-51/+118
|\
| * bugfix: Item_func_min_max stored thd internallySergei Golubchik2017-01-154-6/+28
| * bugfix: cmp_item_row::alloc_comparators() allocated on the wrong arenaSergei Golubchik2017-01-156-34/+20
| * MDEV-9690 concurrent queries with virtual columns crash in temporal codeSergei Golubchik2017-01-154-18/+77
* | connect: compilation errors and few obvious bugsSergei Golubchik2017-01-172-6/+7
* | MDEV-11811: dual master with parallel replication memory leak in write masterKristian Nielsen2017-01-171-0/+1
* | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1412-38/+58
|\ \ | |/
| * MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATESergei Golubchik2017-01-123-1/+19
| * MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || bitmap...Sergei Golubchik2017-01-119-39/+39
* | bump the VERSIONDaniel Bartholomew2017-01-131-1/+1
* | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29Vicențiu Ciorbaru2017-01-12168-2428/+10266
|\ \
| * \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1215-5/+116
| |\ \ | | |/
| | * MDEV-11685: sql_mode can't be set with non-ascii connection charsetNirbhay Choubey2017-01-117-1/+57
| | * MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforci...Sergei Golubchik2017-01-117-2/+52
| | * mysqld_safe: don't close stdout if set -xSergei Golubchik2017-01-101-2/+7
| * | Update mysql_secure_installation man pageiangilfillan2017-01-101-4/+68
| * | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
| * | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-01-104-0/+38
| |\ \ | | |/
| | * Adding LOAD DATA tests for MDEV-11079 and MDEV-11631Alexander Barkov2017-01-094-0/+38
| * | Fix problems from 5.5 mergeVicențiu Ciorbaru2017-01-104-3/+4
| * | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-01-105-64/+129
| |\ \
| | * | 5.6.35Vicențiu Ciorbaru2017-01-075-64/+129
| | * | 5.6.34Sergei Golubchik2016-10-250-0/+0
| * | | Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0vicentiu2017-01-1012-60/+188
| |\ \ \
| | * | | 5.6.35vicentiu2017-01-0712-60/+188
| | * | | 5.6.34Sergei Golubchik2016-10-250-0/+0
| * | | | Merge remote-tracking branch 'connect/10.0' into bb-10.0-vicentiuvicentiu2017-01-0655-1866/+8797
| |\ \ \ \
| | * | | | Modified version numberOlivier Bertrand2016-12-251-1/+1
| | * | | | Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0Olivier Bertrand2016-12-24429-5418/+12770
| | |\ \ \ \
| | * | | | | Fix some XML table type bugs:Olivier Bertrand2016-12-2317-278/+604
| | * | | | | - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1410-97/+64
| | * | | | | - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1222-125/+6579
| | * | | | | - MDEV-11366 SIGBUS errors in Connect Storage Engine for ArmHF and MIPS.Olivier Bertrand2016-12-0212-151/+197
| | * | | | | - Fix null pointer java error when connecting to jdbc:drill driver.Olivier Bertrand2016-11-273-0/+3
| | * | | | | - MDEV-11051 place Java classes ApacheInterface and JdbcInterface into single...Olivier Bertrand2016-11-1410-71/+109
| | * | | | | - Fix MDEV-11234. Escape quoting character. Should be doubled.Olivier Bertrand2016-11-0614-50/+147
| * | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-0676-435/+934
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fixed bug mdev-10705.Igor Babaev2017-01-053-1/+27
| | * | | | | MDEV-11727 Sequences of tests fail with valgrind warnings in buildbotElena Stepanova2017-01-051-0/+8
| | * | | | | MDEV-11700 funcs_2.innodb_charset fails in buldbot on valgrind builder with t...Elena Stepanova2017-01-051-0/+1
| | * | | | | MDEV-11722 main.join_cache fails in buildbot on very slow buildersElena Stepanova2017-01-052-6/+20