summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [MDEV-9468]: Client hangs in my_addr_resolvebb-10.1-mdev-9468Vicențiu Ciorbaru2016-01-261-1/+5
* Revert "[Code cleanup] Refactor duplicate code within myisam and maria sort.cc"Vicențiu Ciorbaru2016-01-172-53/+73
* Revert "Fixed compilation failure on MacOSX"Vicențiu Ciorbaru2016-01-174-350/+313
* Remove warning in my_addr_resolveVicențiu Ciorbaru2016-01-171-2/+3
* [MDEV-9427] Server does not build on OpenSUSE 42.1Vicențiu Ciorbaru2016-01-171-7/+9
* Fixed a crash during stacktrace printing if addr2line failed to start.Vicențiu Ciorbaru2016-01-171-14/+52
* Fixed compilation failure on MacOSXVicențiu Ciorbaru2016-01-174-313/+350
* [Code cleanup] Refactor duplicate code within myisam and maria sort.ccVicențiu Ciorbaru2016-01-172-73/+53
* After-merge fix.Kristian Nielsen2016-01-151-2/+1
* Merge branch 'tmp' into tmp-10.1Kristian Nielsen2016-01-156-10/+36
|\
| * Fix error handling for GTID and domain-based parallel replicationKristian Nielsen2016-01-156-10/+36
* | MDEV-4961 SSPI/GSSAPI/Kerberos authentication pluginVladislav Vaintroub2016-01-1419-0/+1854
* | MDEV-9359: encryption.create_or_replace fails sporadically in buildbot: faili...Jan Lindström2016-01-056-20/+52
* | Merge branch '10.0' into 10.1Vladislav Vaintroub2015-12-301-5/+5
|\ \
| * \ Merge branch '5.5' into 10.0Vladislav Vaintroub2015-12-301-5/+5
| |\ \
| | * | Fix process handle leak in buildbot. GenerateConsoleCtrlEvent sent to non-ex...Vladislav Vaintroub2015-12-301-5/+5
* | | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2015-12-291-5/+5
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-291-5/+5
| |\ \ \ | | |/ /
| | * | Moving Field_blob::store_length() back from protected to public,Alexander Barkov2015-12-291-5/+5
* | | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2015-12-2910-14/+152
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' of github.com:MariaDB/server into 10.0Alexander Barkov2015-12-292-2/+2
| |\ \ \
| | * | | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-291-1/+1
| | * | | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-291-1/+1
| * | | | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-2910-14/+152
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much dataAlexander Barkov2015-12-2910-14/+152
* | | | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-271-1/+1
* | | | Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu...Vladislav Vaintroub2015-12-241-4/+3
* | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-12-232-8/+18
|\ \ \ \
| * | | | MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23Nirbhay Choubey2015-12-231-1/+1
| * | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-221-8/+8
| |\ \ \ \
| | * | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353mariadb-galera-5.5.47Nirbhay Choubey2015-12-221-8/+8
| * | | | | MDEV-9224 : Database lockup on flush in galeraNirbhay Choubey2015-12-221-0/+10
* | | | | | update resultsmariadb-10.1.10Sergei Golubchik2015-12-232-55/+64
* | | | | | remove HA_ERR_INFO, use ER_ALTER_INFOSergei Golubchik2015-12-233-5/+4
* | | | | | Fixed that ccache can be used again (broken by TokuDB patches)Monty2015-12-231-2/+12
* | | | | | Don't send error 0 to my_printf_error()Monty2015-12-234-7/+10
* | | | | | MDEV-9095 - [PATCH] systemd capability for --memlockSergey Vojtovich2015-12-223-10/+24
* | | | | | MDEV-9081 - Debian: insecure debian-sys-maint password handlingSergey Vojtovich2015-12-221-0/+2
* | | | | | MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute pathsSergey Vojtovich2015-12-225-31/+36
* | | | | | Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-12-227-21/+136
|\ \ \ \ \ \
| * | | | | | MDEV-7540 Information Schema SPATIAL_REF_SYS contents don't match the expecte...Alexey Botchkov2015-12-213-8/+15
| * | | | | | MDEV-8627: SHOW GRANTS does not work for a replicated roleVicențiu Ciorbaru2015-12-213-1/+99
| * | | | | | MDEV-9141 : [PATCH] Add CA validation to wsrep_sst_xtrabackup-v2.shNirbhay Choubey2015-12-201-12/+22
* | | | | | | fix galera.lp1438990 testSergei Golubchik2015-12-221-2/+4
* | | | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-2226-141/+382
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-janJan Lindström2015-12-218-27/+164
| * | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-194-1/+65
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353Nirbhay Choubey2015-12-163-1/+49
| | * | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-10122-749/+1962
| | |\ \ \ \ \
| | * | | | | | Add warnings to galera test suppression list.mariadb-galera-5.5.46Nirbhay Choubey2015-10-151-0/+2