View Bazaar branches
Get this repository:
git clone https://git.launchpad.net/maria

MariaDB has 18 active reviews. See all merge proposals.

Import details

Import Status: Reviewed

This repository is an import of the Git repository at https://github.com/MariaDB/server.git.

The next import is scheduled to run .

Last successful import was .

Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 3 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-17 and finished taking 3 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-17 and finished taking 4 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 4 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 4 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-17 and finished taking 4 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 4 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 3 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 3 minutes — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 3 minutes — see the log

Branches

Name Last Modified Last Commit
bb-10.2-flashback 2017-01-24 16:55:37 UTC
[MDEV-11871] mysqlbinlog test case fails caused by Flashback

Author: Lixun Peng
Author Date: 2017-01-24 16:55:37 UTC

[MDEV-11871] mysqlbinlog test case fails caused by Flashback

When mysqlbinlog parses event failed, then delete_dynamic(&binlog_events) will be ingored.
So it caused memory leak.

Moved delete_dynamic(&binlog_events) into cleanup().

MDEV-10570-plinux 2017-01-20 02:04:42 UTC
[MDEV-10570] Merge Existing Community Patch “Flashback”

Author: Lixun Peng
Author Date: 2017-01-20 02:04:42 UTC

[MDEV-10570] Merge Existing Community Patch “Flashback”

==== Description ====

Flashback can rollback the instances/databases/tables to an old snapshot.
It's implement on Server-Level by full image format binary logs (--binlog-row-image=FULL), so it supports all engines.
Currently, it’s a feature inside mysqlbinlog tool (with --flashback arguments).

Because the flashback binlog events will store in the memory, you should check if there is enough memory in your machine.

==== New Arguments ====

--flashback (-B)
It will let mysqlbinlog to work on FLASHBACK mode.

==== Example ====

I have a table "t" in database "test", we can compare the output with "--flashback" and without.

#client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -d test -T t --start-datetime="2013-03-27 14:54:00" > /tmp/1.sql
#client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -d test -T t --start-datetime="2013-03-27 14:54:00" -B > /tmp/2.sql

Then, importing the output flashback file (/tmp/2.log), it can flashback your database/table to the special time (--start-datetime).
And if you know the exact postion, "--start-postion" is also works, mysqlbinlog will output the flashback logs that can flashback to "--start-postion" position.

==== Implement ====

1. As we know, if binlog_format is ROW (binlog-row-image=FULL in 10.1 and later), all columns value are store in the row event, so we can get the data before mis-operation.

2. Just do following things:

  2.1 Change Event Type, INSERT->DELETE, DELETE->INSERT.
  For example:
    INSERT INTO t VALUES (...) ---> DELETE FROM t WHERE ...
    DELETE FROM t ... ---> INSERT INTO t VALUES (...)

  2.2 For Update_Event, swapping the SET part and WHERE part.
  For example:
    UPDATE t SET cols1 = vals1 WHERE cols2 = vals2
    --->
    UPDATE t SET cols2 = vals2 WHERE cols1 = vals1

  2.3 For Multi-Rows Event, reverse the rows sequence, from the last row to the first row.
  For example:
    DELETE FROM t WHERE id=1; DELETE FROM t WHERE id=2; ...; DELETE FROM t WHERE id=n;
    --->
    DELETE FROM t WHERE id=n; ...; DELETE FROM t WHERE id=2; DELETE FROM t WHERE id=1;

  2.4 Output those events from the last one to the first one which mis-operation happened.
  For example:

bb-10.2-mdev7635.saved 2017-01-18 16:44:47 UTC
MDEV-7635: Update tests to adapt to the new default sql_mode

Author: Nirbhay Choubey
Author Date: 2017-01-18 16:44:47 UTC

MDEV-7635: Update tests to adapt to the new default sql_mode

bb-10.1-nirbhay 2017-01-17 21:49:31 UTC
MDEV-10954: sles11 does not have 'which' package (post-fix)

Author: Nirbhay Choubey
Author Date: 2017-01-17 21:49:31 UTC

MDEV-10954: sles11 does not have 'which' package (post-fix)

bb-10.2-cc 2017-01-17 11:17:00 UTC
Updated C/C

Author: Georg Richter
Author Date: 2017-01-17 11:17:00 UTC

Updated C/C

bb-10.1-knielsen 2017-01-13 12:04:30 UTC
Follow-up patch, update debian/patches/

Author: Kristian Nielsen
Author Date: 2017-01-13 12:04:30 UTC

Follow-up patch, update debian/patches/

bb-10.0-MDEV-10644 2016-12-29 07:31:12 UTC
MDEV-10644 One of parallel replication threads remains active

Author: Lixun Peng
Author Date: 2016-12-29 07:31:12 UTC

MDEV-10644 One of parallel replication threads remains active
           after STOP SLAVE SQL_THREAD completes

Using mysql_mutex_trylock() instead of mysql_mutex_lock() for LOCK_active_mi in
function show_slave_received_heartbeats() and show_heartbeat_period().
If can't aquire LOCK_active_mi lock after 1 seconds, then give up and just show
SHOW_UNDEF.
This is a temporary fix. If want to solve related problems completely, should
change the LOCK_active_mi to mysql_rwlock_t.

bb-10.1-wsrep-ctas 2016-11-23 15:41:56 UTC
Refs: MW-317: Post-fix

Author: Nirbhay Choubey
Author Date: 2016-11-23 15:41:56 UTC

Refs: MW-317: Post-fix

bb-10.0-MDEV-10863 2016-11-17 10:32:13 UTC
Fix incorrect reading of events from relaylog in parallel replication.

Author: Kristian Nielsen
Author Date: 2016-11-16 10:00:38 UTC

Fix incorrect reading of events from relaylog in parallel replication.

The SQL thread keeps track of the position in the current relay log from
which to read the next event. This position is not normally used, but a
certain interaction with the IO thread can cause the SQL thread to re-open
the relay log and seek to the stored position.

In parallel replication, there were a couple of places where the position
was not updated. This created a race where a re-open of the relay log could
seek to the wrong position and start re-reading and processing events
already handled once, causing various kinds of problems.

Fix this by moving the position update into a single place in
apply_event_and_update_pos(), which should ensure that the position is
always updated in the parallel replication case.

This problem was found from the testcase of MDEV-10863, but it is logically
a separate problem.

bb-MDEV-10863 2016-11-16 10:11:00 UTC
added a dash in front of extra version number

Author: Rasmus Johansson
Author Date: 2016-11-16 10:11:00 UTC

added a dash in front of extra version number

bb-10.2-mdev10953_1 2016-10-25 13:04:45 UTC
remove sha2 from embedded build

Author: Georg Richter
Author Date: 2016-10-25 13:04:45 UTC

remove sha2 from embedded build

10.2-good_bye_yassl 2016-10-13 10:07:14 UTC
- Replaced yassl by gnutls

Author: Georg Richter
Author Date: 2016-10-13 10:07:14 UTC

- Replaced yassl by gnutls
  TLS functionality is now handled in ma_tls_vio.c
- added new parameter ssl_passphrase for passphrase protected
  keys

bb-10.2-vicentiu-window 2016-09-23 15:15:01 UTC
Make win_big test specify only if Sort_merge_passes have happened

Author: Vicențiu Ciorbaru
Author Date: 2016-09-23 15:15:01 UTC

Make win_big test specify only if Sort_merge_passes have happened

The number is irrelevant and may differ by architecture. We are only
interested if it happened or not

bb-10.2-mdev9736 2016-09-23 11:21:07 UTC
MDEV-9736: Window functions: multiple cursors to read filesort result

Author: Sergey Petrunia
Author Date: 2016-09-23 11:18:29 UTC

MDEV-9736: Window functions: multiple cursors to read filesort result

Add support for having multiple IO_CACHEs with type=READ_CACHE to share
the file they are reading from.
Each IO_CACHE keeps its own in-memory buffer. When doing a read or seek
operation on the file, it notifies other IO_CACHEs that the file position
has been changed.

Make Rowid_seq_cursor use cloned IO_CACHE when reading filesort result.

bb-10.2-decimal 2016-06-23 18:57:53 UTC
Fixed compiler warnings and test failures found by buildbot

Author: Monty
Author Date: 2016-06-23 18:57:53 UTC

Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message

bb-10.0.22-mdev8989 2016-06-15 14:23:47 UTC
Backport of commit 904027c820fb344343de6f68a32bcc889f2bd407 to 10.0.21

Author: Sergey Petrunia
Author Date: 2016-06-15 14:23:47 UTC

Backport of commit 904027c820fb344343de6f68a32bcc889f2bd407 to 10.0.21

Commit message was:

  Merge branch 'bb-10.1-mdev8989' into 10.1

Some test results are probably not yet updated

MDEV-8947 2016-06-08 13:16:39 UTC
Merge branch 'mdev9991' into mdev9991-10.1

Author: Kristian Nielsen
Author Date: 2016-06-08 13:16:39 UTC

Merge branch 'mdev9991' into mdev9991-10.1

bb-10.1-mdev8989 2016-06-02 14:31:56 UTC
Update test results part #3.

Author: Sergey Petrunia
Author Date: 2016-06-02 14:31:56 UTC

Update test results part #3.

bb-10.1-elenst-mdev9909 2016-04-19 21:58:13 UTC
Next part of experimental change for MDEV-9909

Author: Elena Stepanova
Author Date: 2016-04-19 21:58:13 UTC

Next part of experimental change for MDEV-9909

Do not allow file_key_management and example_key_management
to be loaded together, we already know it does not work (MDEV-9948)

bb-10.2-mdev8789 2016-02-17 22:30:25 UTC
Addressed the issues raised in the review for the main patch

Author: Igor Babaev
Author Date: 2016-02-17 22:30:25 UTC

Addressed the issues raised in the review for the main patch
of mdev-8789.
Fixed a bug in TABLE_LIST::print.
Fixed another bug for the case when the definition of a
WITH table contained column list while the join in the main
query used two instances of this table.

bb-10.0-knielsen 2015-11-13 14:30:48 UTC
Merge branch 'mdev7818-4' into bb-10.0-knielsen

Author: Kristian Nielsen
Author Date: 2015-11-13 14:30:48 UTC

Merge branch 'mdev7818-4' into bb-10.0-knielsen

bb-10.1-default 2015-08-17 22:00:28 UTC
Fixed failing tests and compiler warnings

Author: Monty
Author Date: 2015-08-17 22:00:28 UTC

Fixed failing tests and compiler warnings
- UNINIT_VAR() was required for 4.8.3 on openSUSE 13.2
- repair_symlink changed because of some of my earlier fixes for REPAIR

10.0-custombld 2015-06-29 09:52:03 UTC
MDEV-8302: Duplicate key with parallel replication

Author: Kristian Nielsen
Author Date: 2015-06-29 09:41:06 UTC

MDEV-8302: Duplicate key with parallel replication

Intermediate patch to try to track down the root cause of the problem by
running a custom binary on the user's actual load.

This patch adds some printouts in the error log, all prefixed with
"MDEV8302:", that will hopefully trigger when the error condition occurs and
give more information about what is happening.

In addition, this patch implements what might or might not be a fix for the
error (along with a printout to show if the fix actually triggers).

The fix is to add a check for thd->killed just before a transaction does
mark_start_commit(). This could help reduce the chance of a transaction
detecting a deadlock kill only after running mark_start_commit(), which
might be a source of the original duplicate key problem (though no concrete
sequence of events is currently known to be able to cause this condition).

Finally, this patch marks the generated binaries with a -mdev8302a version
postfix to help identify them.

bb-5.5-knielsen 2015-02-23 12:27:51 UTC
MDEV-7310: last_commit_pos_offset set to wrong value after binlog rotate in g...

Author: Kristian Nielsen
Author Date: 2015-02-23 12:27:51 UTC

MDEV-7310: last_commit_pos_offset set to wrong value after binlog rotate in group commit

When the binlog was rotated due to @@max_binlog_size, the values of the
binlog_shapshot_file and binlog_snapshot_position were inconsistent in case of
non-transactional DML. The position was refering to the old file, while the
filename was of the new file after rotation. This patch makes them consistent
by making sure the position is also refering to the new file.

bb-10.1-mdev6657-r2 2014-10-07 08:40:10 UTC
Merge branch '10.1' of github.com:MariaDB/server into 10.1

Author: Monty
Author Date: 2014-10-07 08:40:10 UTC

Merge branch '10.1' of github.com:MariaDB/server into 10.1

Merge with main branch

13011325 of 1425 results

Other repositories

Name Last Modified
lp:maria 3 hours ago
lp:~maria-captains/maria/+git/connector-c 2018-01-08
12 of 2 results
You can't create new repositories for MariaDB.