summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforci...Sergei Golubchik2017-01-041-1/+2
| * | | | | MDEV-10100 main.pool_of_threads fails sporadically in buildbotElena Stepanova2017-01-044-34/+44
| * | | | | MDEV-11719 main.subselect_no_exists_to_in failed in buildbotElena Stepanova2017-01-042-2/+2
| * | | | | bump the VERSIONDaniel Bartholomew2016-12-241-1/+1
| * | | | | reduce code duplication a littlemariadb-5.5.54Sergei Golubchik2016-12-227-42/+27
| * | | | | add an assertSergei Golubchik2016-12-222-10/+9
| * | | | | test case for Bug #23303485 : HANDLE_FATAL_SIGNAL (SIG=11) IN SUBSELECT_UNION...Sergei Golubchik2016-12-222-0/+23
| * | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-12-2211-127/+127
| |\ \ \ \ \
| | * | | | | Bug#25159791 BASEDIR: COMMAND NOT FOUND ERROR WHILE STARTING SERVER WITH INIT...mysql-5.5.54Balasubramanian Kandasamy2016-11-283-5/+5
| | * | | | | Followup fix for Bug#25088048 - ADDITIONAL ISSUES IN MYSQLD_SAFEBalasubramanian Kandasamy2016-11-261-43/+0
| | * | | | | (no commit message)mysql-builder@oracle.com2016-11-250-0/+0
| | * | | | | Bug#25092566: CREATE TABLE WITH DATA DIRECTORY CLAUSE DOES NOT REQUIRE SPECIALDyre Tjeldvoll2016-11-255-3/+59
| | * | | | | Bug#25088048 ADDITIONAL ISSUES IN MYSQLD_SAFETerje Rosten2016-11-259-138/+41
| | * | | | | BUG#24487120 - SLAVE'S SLAVE_SQL_RUNNING IS STOPPED DURINGThayumanavar S2016-10-284-99/+30
| | * | | | | Bug#24925181 INCORRECT ISA DETECTION CODE IN OEL RPM SPECTerje Rosten2016-10-241-8/+15
| | * | | | | BUG#23499695: MYSQL SERVER NORMAL SHUTDOWN WITH TIME STAMPKarthik Kamath2016-10-131-9/+39
| | * | | | | Merge branch 'mysql-5.5.53-release' into mysql-5.5Nawaz Nazeer Ahamed2016-10-120-0/+0
| | |\ \ \ \ \
| | * | | | | | Bug#24483092 UNSAFE USE OF VARIOUS SHELL UTILITIESTerje Rosten2016-10-062-27/+92
| | * | | | | | Fix Bug#24707869 GCC 5 AND 6 MISCOMPILE MACH_PARSE_COMPRESSEDVasil Dimov2016-10-031-11/+42
| | * | | | | | (no commit message)mysql-builder@oracle.com2016-09-290-0/+0
| | * | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-2829-37/+786
| | * | | | | | Bug #24740291: YASSL UPDATE TO 2.4.2Robert Golebiowski2016-09-2711-122/+274
| | * | | | | | Raise version number after cloning 5.5.53Bjorn Munch2016-09-261-1/+1
| | * | | | | | Bug #24496214: MISLEADING ERROR EXECUTING MYSQLADMIN SHUTDOWN AGAINST A SERVERGeorgi Kodinov2016-09-081-2/+4