Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Null-merge 5.6 (commit 3fa45a8) into 5.7 #565

Merged

Conversation

percona-ysorokin
Copy link
Collaborator

No description provided.

vlad-lesin and others added 30 commits December 24, 2015 17:28
The tests for 74644, 77832, 74783, 75701, 74580 are added.

74783 test is not added as 5.5 innodb does not support fulltext indexes.

Conflicts:
	VERSION
	mysql-test/r/mysql_plugin.result
	sql/sql_reload.cc
	sql/sql_select.cc
Fix bug 1530102 (rpl.rpl_bug68490 fails under Valgrind in Jenkins)
Merge branch 'hrvojem-rn-5.5.47-37.7-5.5' into 5.5
…6-ctype_ucs

Fix bug lp:1534246 (5.5) "'ctype_ucs.test' fails sporadically"
Fix bug 1233431 ([ERROR] Cannot find index <col> in InnoDB index tran…
5.5 - Changed package name for cpack from mysql to percona-server (BLD-309)
5.5 - Fix for custom socket location on centos 7 (#1534825)
Fixed LP bug #1521481 by adding a know issues section
5.5 - Add --skip-log-bin for bootstrap mode and run mysql_install_db only on upgrade in debian
The tests for 74670, 76277 bug fixes are added.

Bug lp:1521120 is also fixed.

The test for bug 78292 is added in perfschema.no_threads.

log_slow_applicable() and query_response_time_audit_notify() are fixed to avoid
error of casting from Query_arena* to sp_lex_instr*. The fix is in adding
thd->sp_runtime_ctx check before the casting to be sure we are inside of SP
and thd->stmt_arena can be casted to sp_lex_instr*.

Some replication test results were fixed due to this commit:
907a7cc - Bug#21317739: APPLYING CREATE TEMPORARY TABLE SQL ON A SLAVE
          WITH REPLICATE-REWRITE-DB FAILScommit.

Conflicts:
	README
	VERSION
	mysql-test/r/mysql_config_editor.result
	mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
	mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
	mysql-test/valgrind.supp
	scripts/mysql_config.sh
	sql/mysqld.cc
	sql/mysqld.h
	sql/scheduler.cc
	sql/sql_base.cc
	storage/innobase/handler/ha_innodb.cc
…-fix

Change version from 5.6.28 to 5.6.29
Release notes for Percona Server 5.5.48-37.8 (5.6)
since the file has been removed from source tree
Fixed LP bugs Bug #1413564 and Bug #1522651 (5.6)
Fix bug 1552673 (Buffer pool may fail to remove dirty pages for a par…
Fixed LP bugs: Bug #1511193 and Bug #1524904 (5.6)
georgelorchpercona and others added 14 commits May 3, 2016 20:07
DB-962 : broken memory management in TokuDB 5.6.28-76.1
Fixed DOC-263 by making clear that the warning code should be set as a string (5.6)
Fix lp:1578303 "rpl.rpl_start_stop_slave fail sporadically on 5.5" (5.6).
…5-bigint_gcc5

Fix lp:1578625 "main.bigint/rpl.rpl_stm_user_variables fail on Ubuntu 15.10 Wily in release mode" (5.6)
Make tokudb to be built on MacOS X.
Starts lldb in MacOS terminal for the server instances ran from mtr.
Fix bug 1580227 (Killed connection threads might get their sockets cl…
Fix bug 1581051 (Heap allocator/deallocator mismatch in scalability m…
@laurynas-biveinis
Copy link
Contributor

Have you tested the new testcase if it runs in the 5.7 tree OK?

Fixed problem with MTR test for Oracle Bug #76277 named incorrectly
in 5.7 branch ('bug-76227.test' instead of 'bug-76277.test').
@percona-ysorokin
Copy link
Collaborator Author

Fixed problem with MTR test for Oracle Bug #76277 named incorrectly
in 5.7 branch ('bug-76227.test' instead of 'bug-76277.test').

No Jenkins build link as no actual code changes, just one MTR test renamed.

@laurynas-biveinis
Copy link
Contributor

LGTM

@percona-ysorokin percona-ysorokin merged commit 79a184d into percona:5.7 Jun 2, 2016
george-lorch pushed a commit to george-lorch/percona-server that referenced this pull request Jul 19, 2017
Upstream commit ID : fb-mysql-5.6.35/639b92350f25de340c3d859db267e151b49f4512

Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 31da89c
george-lorch pushed a commit to george-lorch/percona-server that referenced this pull request Jul 20, 2017
Upstream commit ID : fb-mysql-5.6.35/639b92350f25de340c3d859db267e151b49f4512

Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 31da89c
george-lorch pushed a commit to george-lorch/percona-server that referenced this pull request Jul 21, 2017
Upstream commit ID : fb-mysql-5.6.35/639b92350f25de340c3d859db267e151b49f4512

Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 31da89c
george-lorch pushed a commit to george-lorch/percona-server that referenced this pull request Jul 21, 2017
Upstream commit ID : fb-mysql-5.6.35/639b92350f25de340c3d859db267e151b49f4512

Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 31da89c
inikep pushed a commit to inikep/percona-server that referenced this pull request Apr 23, 2020
Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Test Plan: mtr

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 0cc50b38923
inikep pushed a commit to inikep/percona-server that referenced this pull request Feb 24, 2021
Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Test Plan: mtr

Reviewed By: alxyang

Differential Revision: D4725588

Pulled By: yoshinorim

fbshipit-source-id: 0cc50b38923
inikep pushed a commit to inikep/percona-server that referenced this pull request Nov 15, 2021
Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Differential Revision: D4725588 (facebook/mysql-5.6@163cd2a)

Pulled By: yoshinorim

fbshipit-source-id: 363a4e895d2
ldonoso pushed a commit to ldonoso/percona-server that referenced this pull request Mar 15, 2022
Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Differential Revision: D4725588

Pulled By: yoshinorim
inikep pushed a commit to inikep/percona-server that referenced this pull request Apr 9, 2024
Summary:
This diff adds more test coverages for bloomfilter
tests with reverse order column family
Closes facebook/mysql-5.6#573

Differential Revision: D4725588

Pulled By: yoshinorim
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants