summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5-galera' into ↵bb-sachin-10.0-galera-mergeSachin Setiya2017-06-2112-12/+54
|\ | | | | | | bb-sachin-10.0-galera-merge
| * MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsyncbb-sachin-11036Sachin Setiya2017-06-203-0/+18
| | | | | | | | | | | | | | Currently galera has capability of using delta transfer algorithm (rsync) for SST. But for using delta transfer we have change/copy wsrep_sst_rsync wsrep_sst_rsync_wan. This patch creates a symbolic link of wsrep_sst_rsync_wan to wsrep_sst_rsync.
| * bump the VERSIONDaniel Bartholomew2017-05-031-1/+1
| |
| * Add tokudb_bugs test to disabled.mariadb-galera-5.5.56Sachin Setiya2017-05-031-1/+1
| |
| * Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-0319-48/+141
| |\
| * \ Merge pull request #374 from grooverdan/5.5-galera-wsrep.cnf.shJan Lindström2017-05-021-0/+3
| |\ \ | | | | | | | | MDEV-12646: wsrep.cnf - wsrep_on=1 by default
| | * | wsrep.cnf - wsrep_on=1 by defaultJakub Dorňák2017-04-301-0/+3
| |/ / | | | | | | | | | From: https://github.com/devexp-db/mariadb/blob/f27/mariadb-galera.cnf.patch
| * | bump the VERSIONDaniel Bartholomew2017-04-221-1/+1
| | |
| * | Fix BuildBot Failure.mariadb-galera-5.5.55Sachin Setiya2017-04-211-1/+2
| | | | | | | | | | | | | | | In some slave like p8-xenial-bintar-debug we are using C90 standard which does not allow declaration and code to be mixed.
| * | FIX test failuresSachin Setiya2017-04-201-0/+2
| | |
| * | Fix sys_vars.wsrep_provider_options_basic test failure.bb-sachin-5.5-galerabb-5.5-sachin-mergeSachin Setiya2017-04-181-1/+2
| | |
| * | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-18248-3076/+5356
| |\ \ | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * | | Bump WSREP_PATCH_VERSION to 20Sachin Setiya2017-04-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * | | GCF-837 Check wsrep interface version before loading providerSachin Setiya2017-04-181-6/+31
| | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * | | MW-175 Fix definitively lost memory in wsrep_get_paramsDaniele Sciascia2017-04-182-4/+3
| | | |
| * | | MW-267: followup to the original pull request, removed unnecessary cast.Alexey Yurchenko2017-04-181-2/+1
| | | |
| * | | MW-267Sachin Setiya2017-04-182-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix Galera crash at startup when compiled with gcc 6 Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * | | Fix compiler error on gcc 6.x and most of the compiler warnings.Jan Lindström2017-04-0559-199/+41
| | | |
| * | | fix warning "ignoring return value" of fwrite.Jan Lindström2017-04-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Merge pull request https://github.com/MariaDB/server/pull/343 contributed by Eric Herman.
| * | | MDEV-12217 misssing full licenseSergei Golubchik2017-03-102-2/+2
| | | | | | | | | | | | | | | | clarify the license
| * | | Fix bad mergeNirbhay Choubey2017-01-151-1/+0
| | | |
| * | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-27127-581/+1996
| |\ \ \
| * | | | MDEV-11479 Improved wsrep_dirty_readsSachin Setiya2016-12-149-9/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks:- Changes in wsrep_dirty_reads variable 1.) Global + Session scope (Current: session-only) 2.) Can be set using command line. 3.) Allow all commands that do not change data (besides SELECT) 4.) Allow prepared Statements that do not change data 5.) Works with wsrep_sync_wait enabled
| * | | | Revert " MDEV-11016 wsrep_node_is_ready() check is too strict"Sachin Setiya2016-12-143-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72fd15f7c31aa3e3705ae1b005a3247a985c5bb3. # Conflicts: # mysql-test/suite/galera/r/galera_var_dirty_reads.result # mysql-test/suite/galera/t/galera_var_dirty_reads.test
| * | | | Fix test failures.Nirbhay Choubey2016-12-093-9/+19
| | | | |
| * | | | MDEV-11016 wsrep_node_is_ready() check is too strictSachinSetiya2016-12-013-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- The condition that checks for node readiness is too strict as it does not allow SELECTs even if these selects do not access any tables. For example,if we run SELECT 1; OR SELECT @@max_allowed_packet; Solution:- We need not to report this error when all_tables(lex->query_tables) is NULL:
| * | | | MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lockJan Lindström2016-11-092-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | In Galera case this assertion is too strict as conflicting lock could be same as lock here.
| * | | | Adjust test to adapt to a recent change in mysqltest.mariadb-galera-5.5.53Nirbhay Choubey2016-10-171-4/+4
| | | | |
| * | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-1449-352/+871
| |\ \ \ \
| * | | | | MDEV-10853 netcat help output in error log when running xtrabackup SSTHartmut Holzgraefe2016-09-222-2/+2
| | | | | |
| * | | | | Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52Nirbhay Choubey2016-09-1931-322/+274
| |\ \ \ \ \
* | | | | | | bump the VERSIONDaniel Bartholomew2017-06-021-1/+1
| | | | | | |
* | | | | | | Fix galera_var_node_address.testmariadb-galera-10.0.31Sachin Setiya2017-06-012-0/+2
| | | | | | |
* | | | | | | Fix galera_defaults test and check_galera_version.inc scriptSachin Setiya2017-05-313-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
* | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-30491-7947/+11657
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * \ \ \ \ \ \ Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-2011-9/+314
| |\ \ \ \ \ \ \
| | * | | | | | | MDEV-11092 :- Fix Previous commit of MDEV-11092Sachin Setiya2017-05-191-0/+1
| | | | | | | | |
| | * | | | | | | Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| | | | | | | | |
| | * | | | | | | MDEV-11092 Assertion `!writer.checksum_len || writer.remains == 0' failedSachin Setiya2017-05-183-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- This crash happens because logged stmt is quite big and while writing Annotate_rows_log_event it throws EFBIG error but we ignore this error and do not call cache_data->set_incident(). Solution:- When we normally write Binlog_log_event we check for error EFBIG, but we did do this for Annotate_rows_log_event. We check for this error and call cache_data->set_incident() accordingly. # Conflicts: # sql/log.cc
| | * | | | | | | Fixed the bug mdev-12812.Igor Babaev2017-05-173-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another correction of the patch for bug mdev-12670. If a derived table is merged into a select with STRAIGHT_JOIN modifier all IN subquery predicates contained in the specification of the derived table cannot be subject to conversion to semi-joins.
| | * | | | | | | Fixed the bug mdev-12817/mdev-12820.Igor Babaev2017-05-174-1/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a correction of the patch for bug mdev-12670. With the current code handling semi-joins the following must be taken into account. Conversion of an IN subquery predicate into semi-join has to be blocked if the predicate occurs: (a) in the ON expression of an outer join (b) in the ON expression of an inner join embedded directly or indirectly in the inner nest of an outer join. The patch for mdev-12670 blocked conversion to semi-joins only in the case (a), but not in the case (b). This patch blocks the conversion in both cases.
| * | | | | | | | compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
| | | | | | | | |
| * | | | | | | | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release ↵Sergei Golubchik2017-05-191-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -DCMAKE_BUILD_TYPE=Debug fix incorrect merge, 831b531895 was not fully merged into 10.0
| * | | | | | | | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-1937-63/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uploaded 10.0, analyzed everything with the Impact=High (and a couple of Medium)
| * | | | | | | | Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822Marko Mäkelä2017-05-191-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a merge conflict resolution, callers of the added function rec_field_len_in_chars() were removed, but the function itself was not.
| * | | | | | | | Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-182-2/+2
| | | | | | | | |
| * | | | | | | | Fix xtradb handler compilation post mergeVicențiu Ciorbaru2017-05-181-0/+25
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-18104-643/+574
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed typo in the case operator.Oleksandr Byelkin2017-05-181-0/+1
| | | | | | | | | |
| | * | | | | | | | List of unstable tests for 10.0.31 releaseElena Stepanova2017-05-181-75/+66
| | | | | | | | | |
View Lorry Controller Status