Created by Alik and last modified
This branch may be out of date, because Launchpad has not been able to access it since .
Get this branch:
bzr branch lp:~mysql/mysql-server/mysql-next-mr-bugfixing

Branch merges

Related bugs

Related blueprints

Branch information

Oracle/MySQL Engineering
MySQL Server
<private server>
Last mirrored:
Next mirror:

Updating branch...

Launchpad is processing new changes to this branch which will be available in a few minutes. Reload to see the changes.

Recent revisions

3383. By Alexander Nozdrin <email address hidden>

Disable rpl_change_master.test due to Bug 58160.

3382. By Alexander Nozdrin <email address hidden>

Fix rpl_conditional_comments.test. It causes rpl_events to fail first time.

3381. By Tor Didriksen <email address hidden>

Automerge next-mr-opt-team => next-mr-bugfixing

3380. By Sergey Vojtovich <email address hidden>

Merge patch for BUG58079 to next-mr.

3379. By Ramil Kalimullin <email address hidden>

Manual-merge from mysql-trunk-bugfixing.

Note: mysql-test/include/subquery.inc has been modified.
As we have some disabled (skipped) tests which include it,
their results must be adjusted when the tests are enabled.
E.g. subquery_all, subquery_nomat_nosj, subquery_none_jcl6.

3378. By Magne Mahre <email address hidden>

Bug #53373 Comments are not properly removed from the
           pre-processed query buffer.

Preprocessing comments with embedded SQL, the "/*!<sql>*/"
style, failed to provide correct SQL. The preprocessed
output is used in the statement replication subsystem,
and in some cases, the SQL statement sent to the slave was
not functionally equivalent to the one executed on the

The C (and C++) programming language states that a
long ("/* ... */") comment in the input should be
preprocessed and replaced by a single space character
in the output. This behaviour is also adopted by this
fix. To reduce the number of affected test cases, this
space is only inserted when either the preceding or following
character is not a whitespace (i.e a whitespace duplication

3377. By Ramil Kalimullin <email address hidden>

Auto-merge from mysql-trunk-bugfixing.

3376. By Marc Alff

Post merge fix for tests specific to mysql-next-mr

3375. By Tor Didriksen <email address hidden>

Bug #55790 Read_Master_Log_Pos is wrong after Slave_IO_Error= ER_NET_PACKET_TOO_LARGE
Post fix: LOAD_FILE silently fails when running in parallel because of is_secure_file_path()

3374. By Marc Alff

Fixed broken merge

Branch metadata

Branch format:
Branch format 6
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.