summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* after-merge fixesSergei Golubchik2015-06-1613-41/+22
* Fix test case innodb.xa_recovery crash on xtradb.Jan Lindström2015-06-162-3/+4
* Fix test failure on main.partition_innodb.Jan Lindström2015-06-161-13/+15
* Fix crash on test innodb.innodb-virtual-columns. We should createJan Lindström2015-06-161-4/+5
* Fix innochecksum build failure.Jan Lindström2015-06-161-0/+15
* after merge fixes: InnoDB and XtraDBSergei Golubchik2015-06-162-6/+10
* Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-06-1618-27/+17
|\
| * 5.6.25Sergei Golubchik2015-06-1617-26/+16
* | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-1626-544/+465
|\ \
| * | 5.6.24-72.2Sergei Golubchik2015-06-1626-542/+463
* | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-06-1616-237/+437
|\ \ \
| * | | 5.6.25Sergei Golubchik2015-06-1615-236/+436
* | | | MDEV-5309 - RENAME TABLE does not check for existence of the table's engineSergey Vojtovich2015-06-164-9/+25
* | | | MDEV-7771 missing client plugins when mariadb-shared is not installedSergei Golubchik2015-06-154-4/+5
* | | | MDEV-7871 Tests fail massively on "Assertion `status_var.memory_used == 0'" w...Alexey Botchkov2015-06-152-8/+35
* | | | MDEV-8131 MariaDB does not build on hurd-i386: plugin/auth_dialog/dialog.c:17...Sergei Golubchik2015-06-151-0/+2
* | | | include the correct IPv6 check in perfschema testsSergei Golubchik2015-06-1518-37/+17
* | | | don't scream when auto-selected IPv6 is not availableSergei Golubchik2015-06-151-4/+5
* | | | MDEV-8083 MTR is broken on systems with IPv6 disabledSergei Golubchik2015-06-152-1/+2
* | | | Committing a change into r/type_time_hires.result forgottenAlexander Barkov2015-06-151-3/+1
* | | | MDEV-8205 timediff returns null when comparing decimal time to time string valueAlexander Barkov2015-06-153-10/+85
* | | | Merge branch 'mdev8294' into 10.0Kristian Nielsen2015-06-151-0/+6
|\ \ \ \
| * | | | MDEV-8294: Inconsistent behavior of slave parallel threads at runtimeKristian Nielsen2015-06-151-0/+6
* | | | | MDEV-8316: debugger aborting because missing DBUG_RETURN or DBUG_VOID_RETURN ...Kristian Nielsen2015-06-151-5/+5
* | | | | MDEV-8212 alter table - failing to ADD PRIMARY KEY IF NOT EXISTS when existin...Alexey Botchkov2015-06-143-6/+30
* | | | | MDEV-8179: Absent progress report for operations on InnoDB tablesJan Lindström2015-06-142-0/+26
* | | | | MDEV-8285 compile fails under Mac OS X 10.6.8 due to use of strnlenSergei Golubchik2015-06-142-1/+2
* | | | | MDEV-7881: InnoDB Logfile size - misleading error messageJan Lindström2015-06-142-0/+78
* | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2015-06-12167-2025/+3989
|\ \ \ \ \
| * | | | | CRLFSergei Golubchik2015-06-111-616/+616
| * | | | | compiler warningsSergei Golubchik2015-06-111-10/+9
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-11165-1399/+3364
| |\ \ \ \ \
| | * | | | | more renames after tokudb mergeSergei Golubchik2015-06-1110-0/+0
| | * | | | | Item_cache::safe_charset_converter() fixesSergei Golubchik2015-06-111-3/+9
| | * | | | | fix after the tokudb ft-index mergeSergei Golubchik2015-06-112-0/+0
| | * | | | | tests for MDEV-7937: Enforce SSL when --ssl client option is usedmariadb-5.5.44Sergei Golubchik2015-06-098-51/+67
| | * | | | | MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with disabledSergey Vojtovich2015-06-096-8/+46
| | * | | | | MDEV-363 - Server crashes in intern_plugin_lock on concurrent installingSergey Vojtovich2015-06-091-20/+6
| | * | | | | MDEV-363 - Server crashes in intern_plugin_lock on concurrent installingSergey Vojtovich2015-06-091-7/+5
| | * | | | | disable ssl for ssl-disabled testsSergei Golubchik2015-06-091-0/+1
| | * | | | | MDEV-6735: Range checked for each record used with key (also MDEV-7786, MDEV-...Sergei Petrunia2015-06-093-2/+102
| | * | | | | Fix tests for 7937Vicențiu Ciorbaru2015-06-096-22/+4
| | * | | | | Added tests for MDEV-7937Vicențiu Ciorbaru2015-06-096-0/+72
| | * | | | | MDEV-7937: Enforce SSL when --ssl client option is usedVicențiu Ciorbaru2015-06-091-4/+19
| | * | | | | MDEV-7695 MariaDB - ssl - fips: can not connect with --ssl-cipher=DHE-RSA-AES...Sergei Golubchik2015-06-091-26/+26
| | * | | | | MDEV-7268 Column of table cannot be converted from type 'decimal(0,?)' to typ...Alexander Barkov2015-06-093-1/+35
| | * | | | | MDEV-8286 Likely a redundant declaration of Item_cache::used_table_mapAlexander Barkov2015-06-091-6/+2
| | * | | | | MDEV-8050 sphinx test cases cannot run with sphinxsearch-2.2.6Sergei Golubchik2015-06-081-2/+1
| | * | | | | update tokudb versionSergei Golubchik2015-06-081-1/+1
| | * | | | | MDEV-8211 plugins.server_audit fails sporadically in buildbot.Alexey Botchkov2015-06-082-0/+2