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

Proposed by Hrvoje Matijakovic on 2014-07-30
Status: Merged
Approved by: Hrvoje Matijakovic on 2014-07-30
Approved revision: 614
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 on 2014-07-30
Review via email: mp+228812@code.launchpad.net
To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/Makefile'
2--- doc/Makefile 2013-05-06 15:43:51 +0000
3+++ doc/Makefile 2014-07-30 10:19:44 +0000
4@@ -41,7 +41,7 @@
5 @echo "Downloading percona-theme ..."
6 @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.6
7 @echo "Extracting theme."
8- @tar -zxf percona-theme.tar.gz
9+ @tar -mzxf percona-theme.tar.gz
10 @rm -rf source/percona-theme
11 @mv percona-theme source/percona-theme
12 @rm percona-theme.tar.gz
13
14=== added file 'doc/source/percona-theme/static/bullet-yellow-green.png'
15Binary 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
16=== added file 'doc/source/percona-theme/static/bullet-yellow.png'
17Binary 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
18=== added file 'doc/source/percona-theme/static/percona_favicon.ico'
19Binary 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
20=== modified file 'doc/source/performance/query_cache_enhance.rst'
21--- doc/source/performance/query_cache_enhance.rst 2013-07-05 07:28:34 +0000
22+++ doc/source/performance/query_cache_enhance.rst 2014-07-30 10:19:44 +0000
23@@ -32,6 +32,8 @@
24 4 root localhost test Query 1 Waiting on query cache mutex SELECT number from t where id > 0;
25 5 root localhost test Query 0 NULL
26
27+.. _ignoring_comments:
28+
29 Ignoring comments
30 =================
31

Subscribers

People subscribed via source and target branches