summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-19133-585/+600
* MDEV-5597 - Reduce usage of LOCK_open: LOCK_flushSergey Vojtovich2014-02-133-24/+54
* MDEV-5492 - Reduce usage of LOCK_open: TABLE::in_useSergey Vojtovich2014-02-138-120/+83
* MDEV-5403 - Reduce usage of LOCK_open: tc_countSergey Vojtovich2014-02-131-50/+74
* Changed " to ' around connection name (safer)Michael Widenius2014-02-122-6/+6
* Fixed that --apply-slave-statements also uses multi-sourceMichael Widenius2014-02-112-9/+12
* Automatic mergeMichael Widenius2014-02-112-11/+21
|\
| * Fixed test case as gtid events are not counted anymoreMichael Widenius2014-02-112-11/+22
| * Fixed wrong result fileMichael Widenius2014-02-111-1/+0
* | Fixed MDEV-4551: mysqldump --dump-slave fails with multi-source replicationMichael Widenius2014-02-112-47/+90
* | Fixed MDEV-3815: Aria engine return "The table is full" (ERROR 1114) insertin...Michael Widenius2014-02-118-27/+50
* | Merge 10.0-base -> 10.0unknown2014-02-117-1/+45
|\ \ | |/
| * MDEV-4937: sql_slave_skip_counter does not work with GTIDunknown2014-02-117-1/+45
* | Increase version numberElena Stepanova2014-02-111-1/+1
* | Merge MariaDB 10.0-base to 10.0.unknown2014-02-1044-127/+1413
|\ \ | |/
| * Fix check_testcase complaints due to missing SET debug_sync=RESET in a few te...unknown2014-02-108-0/+12
| * Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-1038-103/+1276
| |\
| | * MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.testunknown2014-02-092-4/+0
| | * MDEV-5636: Deadlock in RESET MASTERunknown2014-02-092-12/+24
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-084-201/+246
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-085-12/+17
| | * MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.testunknown2014-02-0713-48/+118
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-0726-39/+1084
| * | MDEV-5509: Seconds_behind_master incorrect in parallel replicationunknown2014-01-087-13/+122
* | | skip performance_schema also in spider/bg suiteSergei Golubchik2014-02-061-1/+1
* | | update failing test to match recently updated result fileSergei Golubchik2014-02-061-1/+1
* | | merge with 10.0-montySergei Golubchik2014-02-06153-835/+3136
|\ \ \
| * | | Fixed errors and warnings found by buildbotMichael Widenius2014-02-0614-19/+37
| * | | MDEV-5602: CREATE OR REPLACE obtains stricter locks than the connection had b...Michael Widenius2014-02-056-9/+85
| * | | Marked some very slow tokudb test with --big_testMichael Widenius2014-02-052-0/+2
| * | | Automatic mergeMichael Widenius2014-02-05141-814/+3019
| |\ \ \
| | * | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-0542-109/+1112
| | * | | Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-3121-145/+261
| | * | | Fixed compiler warningsMichael Widenius2014-01-2910-4/+27
| | * | | Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-2938-408/+1195
| | * | | Cleanups:Michael Widenius2014-01-0914-7/+175
| | * | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-0244-168/+279
| | * | | Increased back_log to 150, but not more than max_connections.Michael Widenius2013-12-275-9/+16
* | | | | fix tests for solaris - different errno numbers and/or different errno messagesSergei Golubchik2014-02-062-2/+3
* | | | | fix tests to cleanup after themselvesSergei Golubchik2014-02-0610-0/+16
* | | | | another TLS valgrind suppressionSergei Golubchik2014-02-061-0/+9
* | | | | fix the fix and update test results for MDEV-4439Sergei Golubchik2014-02-064-11/+49
* | | | | MDEV-4439 ALTER TABLE .. [ADD|DROP] FOREIGN KEY IF [NOT] EXISTS does not work...Alexey Botchkov2014-02-064-29/+223
* | | | | MDEV-5499 install_spider.sql tries to create tables with DEFAULT clause for T...Sergei Golubchik2014-02-061-42/+42
* | | | | mtr: allow nested plugin suites to be defaults tooSergei Golubchik2014-02-061-6/+11
* | | | | Merge 10.0-connect -> 10.0Alexander Barkov2014-02-0633-356/+1031
|\ \ \ \ \
| * \ \ \ \ Merge 10.0->10.0-connectAlexander Barkov2014-02-05521-7086/+34989
| |\ \ \ \ \
| * | | | | | - Fix a few GCC errors an warningsOlivier Bertrand2014-02-032-5/+7
| * | | | | | This is a major update of CONNECT that goes from version 1.1 to 1.2Olivier Bertrand2014-02-0333-356/+1029
* | | | | | | revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not workSergei Golubchik2014-02-052-16/+16