Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~hrvojem/percona-server/rn-5.1.73-14.2-5.6 into lp:percona-server/5.6

  1. rn-5.1.73-14.2-5.6
  2. Merge into 5.6
Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 640
Proposed branch: lp:~hrvojem/percona-server/rn-5.1.73-14.2-5.6
Merge into: lp:percona-server/5.6
Diff against target: 30 lines (+3/-1)
2 files modified
doc/Makefile (+1/-1)
doc/source/performance/query_cache_enhance.rst (+2/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-server/rn-5.1.73-14.2-5.6
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Review via email: mp+228812@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/Makefile'
--- doc/Makefile 2013-05-06 15:43:51 +0000
+++ doc/Makefile 2014-07-30 10:19:44 +0000
@@ -41,7 +41,7 @@
41 @echo "Downloading percona-theme ..."41 @echo "Downloading percona-theme ..."
42 @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.642 @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.6
43 @echo "Extracting theme."43 @echo "Extracting theme."
44 @tar -zxf percona-theme.tar.gz44 @tar -mzxf percona-theme.tar.gz
45 @rm -rf source/percona-theme45 @rm -rf source/percona-theme
46 @mv percona-theme source/percona-theme46 @mv percona-theme source/percona-theme
47 @rm percona-theme.tar.gz47 @rm percona-theme.tar.gz
4848
=== added file 'doc/source/percona-theme/static/bullet-yellow-green.png'
49Binary files doc/source/percona-theme/static/bullet-yellow-green.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/bullet-yellow-green.png 2014-07-30 10:19:44 +0000 differ49Binary files doc/source/percona-theme/static/bullet-yellow-green.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/bullet-yellow-green.png 2014-07-30 10:19:44 +0000 differ
=== added file 'doc/source/percona-theme/static/bullet-yellow.png'
50Binary files doc/source/percona-theme/static/bullet-yellow.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/bullet-yellow.png 2014-07-30 10:19:44 +0000 differ50Binary files doc/source/percona-theme/static/bullet-yellow.png 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/bullet-yellow.png 2014-07-30 10:19:44 +0000 differ
=== added file 'doc/source/percona-theme/static/percona_favicon.ico'
51Binary files doc/source/percona-theme/static/percona_favicon.ico 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/percona_favicon.ico 2014-07-30 10:19:44 +0000 differ51Binary files doc/source/percona-theme/static/percona_favicon.ico 1970-01-01 00:00:00 +0000 and doc/source/percona-theme/static/percona_favicon.ico 2014-07-30 10:19:44 +0000 differ
=== modified file 'doc/source/performance/query_cache_enhance.rst'
--- doc/source/performance/query_cache_enhance.rst 2013-07-05 07:28:34 +0000
+++ doc/source/performance/query_cache_enhance.rst 2014-07-30 10:19:44 +0000
@@ -32,6 +32,8 @@
32 4 root localhost test Query 1 Waiting on query cache mutex SELECT number from t where id > 0;32 4 root localhost test Query 1 Waiting on query cache mutex SELECT number from t where id > 0;
33 5 root localhost test Query 0 NULL33 5 root localhost test Query 0 NULL
3434
35.. _ignoring_comments:
36
35Ignoring comments37Ignoring comments
36=================38=================
3739

Subscribers

People subscribed via source and target branches