Merge lp:~hrvojem/percona-server/rn-5.1.73-14.2-5.5 into lp:percona-server/5.5
- rn-5.1.73-14.2-5.5
- Merge into 5.5
Proposed by
Hrvoje Matijakovic
Status: | Merged |
---|---|
Approved by: | Hrvoje Matijakovic |
Approved revision: | no longer in the source branch. |
Merged at revision: | 687 |
Proposed branch: | lp:~hrvojem/percona-server/rn-5.1.73-14.2-5.5 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
435 lines (+158/-131) 4 files modified
doc/Makefile (+1/-1) doc/source/percona-theme/layout.html (+44/-37) doc/source/percona-theme/static/percona.com.css (+111/-93) 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.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Hrvoje Matijakovic | Approve | ||
Review via email: mp+228808@code.launchpad.net |
Commit message
Description of the change
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
1 | === modified file 'doc/Makefile' | |||
2 | --- doc/Makefile 2012-09-04 23:24:39 +0000 | |||
3 | +++ doc/Makefile 2014-07-30 09:57:22 +0000 | |||
4 | @@ -41,7 +41,7 @@ | |||
5 | 41 | @echo "Downloading percona-theme ..." | 41 | @echo "Downloading percona-theme ..." |
6 | 42 | @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.5 | 42 | @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-server/5.5 |
7 | 43 | @echo "Extracting theme." | 43 | @echo "Extracting theme." |
9 | 44 | @tar -zxf percona-theme.tar.gz | 44 | @tar -mzxf percona-theme.tar.gz |
10 | 45 | @rm -rf source/percona-theme | 45 | @rm -rf source/percona-theme |
11 | 46 | @mv percona-theme source/percona-theme | 46 | @mv percona-theme source/percona-theme |
12 | 47 | @rm percona-theme.tar.gz | 47 | @rm percona-theme.tar.gz |
13 | 48 | 48 | ||
14 | === modified file 'doc/source/percona-theme/layout.html' | |||
15 | --- doc/source/percona-theme/layout.html 2012-10-11 09:53:58 +0000 | |||
16 | +++ doc/source/percona-theme/layout.html 2014-07-30 09:57:22 +0000 | |||
17 | @@ -61,7 +61,9 @@ | |||
18 | 61 | +1-208-473-2904 (USA - Sales) | 61 | +1-208-473-2904 (USA - Sales) |
19 | 62 | </div> | 62 | </div> |
20 | 63 | <div style="padding-bottom: 4px;"> | 63 | <div style="padding-bottom: 4px;"> |
22 | 64 | +44-208-133-0309 (UK - Sales) | 64 | +44-208-133-0309 (UK - Sales)<br /> |
23 | 65 | 0-800-051-8984 (UK - Sales)<br /> | ||
24 | 66 | 0-800-181-0665 (GER - Sales)<br /> | ||
25 | 65 | </div> | 67 | </div> |
26 | 66 | <div style="padding-bottom: 4px;"> | 68 | <div style="padding-bottom: 4px;"> |
27 | 67 | +1-877-862-4316 (Emergency) | 69 | +1-877-862-4316 (Emergency) |
28 | @@ -76,10 +78,10 @@ | |||
29 | 76 | 78 | ||
30 | 77 | <div class="side-column-block"> | 79 | <div class="side-column-block"> |
31 | 78 | <div class="a-btn-container"> | 80 | <div class="a-btn-container"> |
36 | 79 | <a title="Download PDF Manual for Percona Server 5.5" href="http://form.percona.com/PerconaServer55OperationsManual.html" class="a-btn-new"> | 81 | <a title="Download PDF Manual for Percona Server 5.5" onclick="_gaq.push(['b._trackEvent', 'Percona Server', 'Download', 'Download Manual Percona Server 5.5 ']);" href="http://form.percona.com/Percona-Server-55-Series-Manual.html" class="a-btn-green"> |
37 | 80 | <span class="a-btn-text">Download Manual</span> | 82 | <span class="a-btn-text-green">Download Manual</span> |
38 | 81 | <span class="a-btn-fixed-slide-text">PDF for version 5.5</span> | 83 | <span class="a-btn-fixed-slide-text-green">PDF for version 5.5</span> |
39 | 82 | <span class="a-btn-icon-right"><span></span></span> | 84 | <span class="a-btn-icon-right-green"><span></span></span> |
40 | 83 | </a> | 85 | </a> |
41 | 84 | </div></div> | 86 | </div></div> |
42 | 85 | 87 | ||
43 | @@ -95,7 +97,7 @@ | |||
44 | 95 | {%- block serverseries %} | 97 | {%- block serverseries %} |
45 | 96 | <div class="side-column-block"> | 98 | <div class="side-column-block"> |
46 | 97 | <h3>Percona Server Series</h3> | 99 | <h3>Percona Server Series</h3> |
48 | 98 | <ul><li><a href="http://www.percona.com/doc/percona-server/5.1/">Percona Server 5.1</a></li><li><a href="http://www.percona.com/doc/percona-server/5.5/">Percona Server 5.5</a></li></ul> | 100 | <ul><li><a href="http://www.percona.com/doc/percona-server/5.1/">Percona Server 5.1</a></li><li><a href="http://www.percona.com/doc/percona-server/5.5/">Percona Server 5.5</a></li><li><a href="http://www.percona.com/doc/percona-server/5.6/">Percona Server 5.6</a></li></ul> |
49 | 99 | </div> | 101 | </div> |
50 | 100 | {%- endblock %} | 102 | {%- endblock %} |
51 | 101 | {%- block sidebartoc %} | 103 | {%- block sidebartoc %} |
52 | @@ -156,6 +158,7 @@ | |||
53 | 156 | <html xmlns="http://www.w3.org/1999/xhtml"> | 158 | <html xmlns="http://www.w3.org/1999/xhtml"> |
54 | 157 | <head> | 159 | <head> |
55 | 158 | <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" /> | 160 | <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" /> |
56 | 161 | <link rel="shortcut icon" href="_static/percona_favicon.ico"/> | ||
57 | 159 | {{ metatags }} | 162 | {{ metatags }} |
58 | 160 | {%- block htmltitle %} | 163 | {%- block htmltitle %} |
59 | 161 | <title>{{ title|striptags|e }}{{ titlesuffix }}</title> | 164 | <title>{{ title|striptags|e }}{{ titlesuffix }}</title> |
60 | @@ -172,9 +175,6 @@ | |||
61 | 172 | 175 | ||
62 | 173 | <script src="{{ pathto('_static/percona.com.js', 1)}}" type="text/javascript"></script> | 176 | <script src="{{ pathto('_static/percona.com.js', 1)}}" type="text/javascript"></script> |
63 | 174 | 177 | ||
64 | 175 | {%- if favicon %} | ||
65 | 176 | <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/> | ||
66 | 177 | {%- endif %} | ||
67 | 178 | {%- endif %} | 178 | {%- endif %} |
68 | 179 | {%- block linktags %} | 179 | {%- block linktags %} |
69 | 180 | {%- if hasdoc('about') %} | 180 | {%- if hasdoc('about') %} |
70 | @@ -209,13 +209,13 @@ | |||
71 | 209 | <!-- <div id="stickywrapper"> --> | 209 | <!-- <div id="stickywrapper"> --> |
72 | 210 | <!-- <div id="stickycontent"> --> | 210 | <!-- <div id="stickycontent"> --> |
73 | 211 | <div id="header"><div class="header"> | 211 | <div id="header"><div class="header"> |
75 | 212 | <div class="logo"><a href="http://www.percona.com/" onfocus="this.blur()"><img src="http://s3.percona.com/ui-logo.png" alt="Percona Performance Consulting Experts" width="240" height="55" /></a></div> | 212 | <div class="logo"><a href="http://www.percona.com/" onfocus="this.blur()"><img src="http://s3.percona.com/ui-logo.png" alt="Percona Performance Consulting Experts" width="220" height="55" /></a></div> |
76 | 213 | <div class="right"> | 213 | <div class="right"> |
77 | 214 | <div class="searchlink"><a onmouseover="SEARCH.Open()"><img id="searchlink-anchor" src="http://s2.percona.com/ui-search.png" alt="" /></a></div> | 214 | <div class="searchlink"><a onmouseover="SEARCH.Open()"><img id="searchlink-anchor" src="http://s2.percona.com/ui-search.png" alt="" /></a></div> |
82 | 215 | <span class="inv"><![CDATA[<noindex>]]></span> | 215 | <span class="inv"><![CDATA[<noindex>]]></span> |
83 | 216 | <div class="navicontainer"><div class="navi"> | 216 | <div class="navicontainer"><div class="navi"> |
84 | 217 | <span id="navilink-span-menu-914"><a href="/about-percona" title="" id="navilink-a-menu-914">About</a></span><span id="navilink-span-menu-915"><a href="/products" title="" id="navilink-a-menu-915">Products</a></span><span id="navilink-span-menu-916"><a href="/software" id="navilink-a-menu-916">Software</a></span><span id="navilink-span-menu-918"><a href="/resources" title="" id="navilink-a-menu-918">Resources</a></span><span id="navilink-span-menu-919"><a href="/news-and-events" title="" id="navilink-a-menu-919">News & Events</a></span><span id="navilink-span-menu-920"><a href="/contact" id="navilink-a-menu-920">Contact Us</a></span><span id="navilink-span-menu-1060"><a href="/live" title="" id="navilink-a-menu-1060">Percona Live</a></span> </div></div> | 217 | <span id="navilink-span-menu-914"><a href="http://www.percona.com/about-percona" id="navilink-a-menu-914">About</a></span><span id="navilink-span-menu-915"><a href="http://www.percona.com/products" id="navilink-a-menu-915">Products</a></span><span id="navilink-span-menu-1125"><a href="http://www.percona.com/software" title="" id="navilink-a-menu-1125">Software</a></span><span id="navilink-span-menu-918"><a href="http://www.percona.com/resources" id="navilink-a-menu-918">Resources</a></span><span id="navilink-span-menu-919"><a href="http://www.percona.com/news-and-events" title="Get all of the latest Percona news, events and press releases on the MySQL community. Update yourself with the latest MySQL and MariaDB developments today." id="navilink-a-menu-919">News/Events</a></span><span id="navilink-span-menu-1129"><a href="http://www.percona.com/percona-community" id="navilink-a-menu-1129">Community</a></span><span id="navilink-span-menu-920"><a href="http://www.percona.com/contact" title="" id="navilink-a-menu-920">Contact</a></span><span id="navilink-span-menu-1060"><a href="http://www.percona.com/live" title="" id="navilink-a-menu-1060">Percona Live</a></span> </div></div> |
85 | 218 | <span class="inv"><![CDATA[</noindex>]]></span> | 218 | <span class="inv"><![CDATA[</noindex>]]></span> |
86 | 219 | </div> | 219 | </div> |
87 | 220 | </div></div><!-- /.header /#header --> | 220 | </div></div><!-- /.header /#header --> |
88 | 221 | 221 | ||
89 | @@ -300,11 +300,14 @@ | |||
90 | 300 | 300 | ||
91 | 301 | {%- block footer %} | 301 | {%- block footer %} |
92 | 302 | 302 | ||
93 | 303 | |||
94 | 303 | <div class="file-bugs"> | 304 | <div class="file-bugs"> |
97 | 304 | This documentation is developed in Launchpad as part of the <a href="https://code.launchpad.net/percona-server">Percona Server source code</a>.<br/> | 305 | This documentation is developed in Launchpad as part of the <a rel="nofollow" href="https://code.launchpad.net/percona-server">Percona Server source code</a>.<br/> |
98 | 305 | If you spotted innacuracies, errors, don't understood it or you think something is missing or should be improved, please <a href="https://bugs.launchpad.net/percona-server/+filebug?field.tags=doc&field.comment=[In:Percona Server Documentation]&?field.tags=doc&field.title=[DOC] ">file a bug</a>. | 306 | If you spotted innacuracies, errors, don't understood it or you think something is missing or should be improved, please <a rel="nofollow" href="https://bugs.launchpad.net/percona-server/+filebug?field.tags=doc&field.comment=[In:Percona Server Documentation]&?field.tags=doc&field.title=[DOC] ">file a bug</a>. |
99 | 306 | 307 | ||
100 | 307 | </div> | 308 | </div> |
101 | 309 | |||
102 | 310 | |||
103 | 308 | 311 | ||
104 | 309 | <div id="footer"> | 312 | <div id="footer"> |
105 | 310 | 313 | ||
106 | @@ -314,30 +317,25 @@ | |||
107 | 314 | 317 | ||
108 | 315 | <div class="text"> | 318 | <div class="text"> |
109 | 316 | <span class="inv"><!--[CDATA[<noindex-->]]></span> | 319 | <span class="inv"><!--[CDATA[<noindex-->]]></span> |
111 | 317 | Call us: 1-888-316-9775 • <a href="/contact">Contact Us</a><br> | 320 | Call us: 1-888-316-9775 • <a href="http://www.percona.com/contact">Contact Us</a><br> |
112 | 318 | MySQL and InnoDB are trademarks of Oracle Corp.<br> | 321 | MySQL and InnoDB are trademarks of Oracle Corp.<br> |
116 | 319 | Proudly running <a href="/software/percona-server/">Percona Server<span id="recentServerVersion"></span></a><br> | 322 | Proudly running <a href="http://www.percona.com/software/percona-server/">Percona Server<span id="recentServerVersion"></span></a><br> |
117 | 320 | Copyright © 2006-2011 Percona Inc.<br> | 323 | Copyright © 2013 Percona<br> |
118 | 321 | <a href="/about-us/policies/">Copyright, Trademark, and Privacy Policy</a> • <a href="/sitemap/">Sitemap</a> | 324 | <a href="http://www.percona.com/about-us/policies/">Copyright, Trademark, and Privacy Policy</a> • <a href="http://www.percona.com/site_map/">Sitemap</a> |
119 | 322 | <span class="inv"><!--[CDATA[</noindex-->]]></span> | 325 | <span class="inv"><!--[CDATA[</noindex-->]]></span> |
120 | 323 | </div> | 326 | </div> |
121 | 324 | </div> | 327 | </div> |
122 | 325 | 328 | ||
123 | 326 | </div> | 329 | </div> |
124 | 327 | {%- endblock %} | 330 | {%- endblock %} |
133 | 328 | <span class="inv"><!--[CDATA[<noindex-->]]></span> | 331 | <span class="inv"><![CDATA[<noindex>]]></span> |
134 | 329 | <div id="submenus"> | 332 | <div id="submenus"> |
135 | 330 | <div class="navi-dropdown" id="navi-dropdown-menu-914"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/about-us/our-mission">Mission</a></div><div class="item"><a href="/about-us/our-team">Team</a></div><div class="item"><a href="/about-us/customers">Customers</a></div><div class="item"><a href="/about-us/careers">Careers</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-915"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/mysql-support">MySQL Support</a></div><div class="item"><a href="/mysql-consulting">MySQL Consulting</a></div><div class="item"><a href="/training">MySQL Training</a></div><div class="item"><a href="/development">MySQL Server Development</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-916"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/software">Percona Software for MySQL</a></div><div class="item"><a href="/software/percona-server">Percona Server with XtraDB</a></div><div class="item"><a href="/software/percona-xtradb-cluster">Percona XtraDB Cluster</a></div><div class="item"><a href="/software/percona-toolkit">Percona Toolkit</a></div><div class="item"><a href="/software/percona-monitoring-plugins">Percona Monitoring Plugins</a></div><div class="item"><a href="/software/mysql-innodb-data-recovery-tools">Data Recovery Toolkit</a></div><div class="item"><a href="/software/percona-xtrabackup">Percona XtraBackup</a></div><div class="item"><a href="/software/percona-xtradb">Percona XtraDB</a></div><div class="item"><a href="http://www.percona.com/downloads/">Downloads</a></div><div class="item"><a href="/software/repositories">Repositories</a></div><div class="item"><a href="/software/documentation">Documentation</a></div><div class="item"><a href="http://forum.percona.com">Forum</a></div><div class="item"><a href="http://groups.google.com/group/percona-discussion">Google Discussion</a></div><div class="item"><a href="https://launchpad.net/percona-server">Launchpad</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-918"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/webinars">Webinars</a></div><div class="item"><a href="/about-us/blogs">Blogs</a></div><div class="item"><a href="/about-us/presentations">Technical Presentations</a></div><div class="item"><a href="/about-us/books">Books by Percona Authors</a></div><div class="item"><a href="/about-us/mysql-white-papers">White Papers</a></div><div class="item"><a href="/about-us/mysql-case-studies">Case Studies</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-919"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/percona-news">In The News</a></div><div class="item"><a href="/about-us/pressreleases">Press Releases</a></div><div class="item"><a href="/live-2">Percona Live Conferences</a></div><div class="item"><a href="/mysql-events">MySQL Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-920"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/contact/24x7-emergency">24x7 Emergency</a></div><div class="item"><a href="/contact/sales">Sales & General Inquiries</a></div><div class="item"><a href="/contact/billing">Billing Inquiries</a></div><div class="item"><a href="https://customers.percona.com/">Customer Portal Login</a></div><div class="item"><a href="/contact/phone-directory">Phone Directory</a></div><div class="item"><a href="/subscribe">Subscribe to Newsletter</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-1060"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://www.percona.com/live/nyc-2012/">New York 2012</a></div><div class="item"><a href="http://www.percona.com/live/london-2012/">London 2012</a></div><div class="item"><a href="http://www.percona.com/live/mysql-conference-2012/">MySQL Conference & Expo 2012</a></div><div class="item"><a href="/live">Previous Percona Live Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div> | 333 | <div class="navi-dropdown" id="navi-dropdown-menu-914"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/about-us/our-mission">Mission</a></div><div class="item"><a href="/about-us/our-team">Team</a></div><div class="item"><a href="/about-us/customers">Customers</a></div><div class="item"><a href="/about-us/partners">Partners</a></div><div class="item"><a href="/about-us/careers">Careers</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-915"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/products/mysql-support">MySQL Support</a></div><div class="item"><a href="/products/mysql-consulting">MySQL Consulting</a></div><div class="item"><a href="/products/mysql-remote-dba">MySQL Remote DBA</a></div><div class="item"><a href="/products/mysql-training">MySQL Training</a></div><div class="item"><a href="/products/mysql-development">MySQL Server Development</a></div><div class="item"><a href="/mysql-5.6-solutions-from-percona">MySQL 5.6 Solutions</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-1125"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/software">Percona Software for MySQL</a></div><div class="item"><a href="/software/percona-server">Percona Server</a></div><div class="item"><a href="/software/percona-xtradb-cluster">Percona XtraDB Cluster</a></div><div class="item"><a href="/software/percona-toolkit">Percona Toolkit for MySQL</a></div><div class="item"><a href="/software/percona-monitoring-plugins">Percona Monitoring Plugins</a></div><div class="item"><a href="/software/mysql-innodb-data-recovery-tools">Data Recovery Toolkit</a></div><div class="item"><a href="/software/percona-xtrabackup">Percona XtraBackup</a></div><div class="item"><a href="/software/percona-xtradb">Percona XtraDB</a></div><div class="item"><a href="/software/repositories">Repositories</a></div><div class="item"><a href="/software/documentation">Documentation</a></div><div class="item"><a href="/downloads">Download Percona Software</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-918"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/resources/mysql-webinars">Webinars</a></div><div class="item"><a href="/resources/percona-tools-for-mysql">Percona Tools for MySQL</a></div><div class="item"><a href="https://tools.percona.com/wizard">Configuration Wizard for MySQL</a></div><div class="item"><a href="https://tools.percona.com/query-advisor">Query Advisor for MySQL</a></div><div class="item"><a href="/resources/presentations">Technical Presentations</a></div><div class="item"><a href="/resources/mysql-white-papers">White Papers</a></div><div class="item"><a href="/resources/mysql-case-studies">Case Studies</a></div><div class="item"><a href="/resources/books">Books by Percona Authors</a></div><div class="item"><a href="/resources/mysql-blogs">Blogs</a></div><div class="item"><a href="/resources/mysql-videos">Videos</a></div><div class="item"><a href="/resources/mysql-ebooks">eBooks</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-919"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/news-and-events/percona-in-the-news">In The News</a></div><div class="item"><a href="/news-and-events/pressreleases">Press Releases</a></div><div class="item"><a href="/news-and-events/awards">Awards</a></div><div class="item"><a href="/news-and-events/mysql-events">MySQL Events</a></div><div class="item"><a href="/news-and-events/percona-university">Percona University</a></div><div class="item"><a href="/live/conferences">Percona Live Conferences</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-1129"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://www.percona.com/forums">Forums</a></div><div class="item"><a href="http://www.mysqlperformanceblog.com/">MySQL Performance Blog</a></div><div class="item"><a rel="nofollow" href="http://groups.google.com/group/percona-discussion">Google Discussion Group</a></div><div class="item"><a rel="nofollow" href="http://twitter.com/percona">Twitter</a></div><div class="item"><a rel="nofollow" href="https://www.facebook.com/Percona">Facebook</a></div><div class="item"><a rel="nofollow" href="http://www.linkedin.com/groups?gid=2299033&trk=hb_side_g">Linkedin</a></div><div class="item"><a rel="nofollow" href="https://launchpad.net/percona-project">Launchpad</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-920"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/contact/24x7-emergency">24x7 Emergency</a></div><div class="item"><a href="/contact/sales">Sales & General Inquiries</a></div><div class="item"><a href="/contact/billing">Billing Inquiries</a></div><div class="item"><a href="https://customers.percona.com/">Customer Portal Login</a></div><div class="item"><a href="/contact/phone-directory">Phone Directory</a></div><div class="item"><a href="/subscribe">Subscribe to Newsletter</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-1060"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://www.percona.com/live/mysql-conference-2014/">MySQL Conference & Expo 2014</a></div><div class="item"><a href="http://www.percona.com/live/london-2013/">London 2013</a></div><div class="item"><a href="http://www.percona.com/live/mysql-conference-2013/">MySQL Conference & Expo 2013</a></div><div class="item"><a href="http://www.percona.com/live/london-2012/">London 2012</a></div><div class="item"><a href="http://www.percona.com/live/nyc-2012/">New York 2012</a></div><div class="item"><a href="http://www.percona.com/live/mysql-conference-2012/">MySQL Conference & Expo 2012</a></div><div class="item"><a href="/live">Previous Percona Live Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div> <div id="search-dropdown" class="search-dropdown"> |
128 | 331 | |||
129 | 332 | |||
130 | 333 | |||
131 | 334 | |||
132 | 335 | <div id="search-dropdown" class="search-dropdown"> | ||
136 | 336 | <div class="search-dropdown-header"><!-- //--></div> | 334 | <div class="search-dropdown-header"><!-- //--></div> |
137 | 337 | <div class="search-dropdown-content"> | 335 | <div class="search-dropdown-content"> |
138 | 338 | <div class="search-info">Search Percona.com:</div> | 336 | <div class="search-info">Search Percona.com:</div> |
141 | 339 | <form method="get" action="http://search.percona.com/search/" id="search-form"> | 337 | <form method="get" action="http://www.percona.com/search" id="search-form"> |
142 | 340 | <div class="form"><input type="text" id="search-input" name="q" maxlength="100"></div> | 338 | <div class="form"><input type="text" id="search-input" name="s" maxlength="100" /></div> |
143 | 341 | </form> | 339 | </form> |
144 | 342 | </div> | 340 | </div> |
145 | 343 | <div class="search-dropdown-footer"><!-- //--></div> | 341 | <div class="search-dropdown-footer"><!-- //--></div> |
146 | @@ -345,19 +343,28 @@ | |||
147 | 345 | </div> | 343 | </div> |
148 | 346 | <div id="stats"> | 344 | <div id="stats"> |
149 | 347 | <!-- GA //--> | 345 | <!-- GA //--> |
150 | 348 | <script src="http://www.percona.com/static/js/urchin.js" type="text/javascript"></script> | ||
151 | 349 | <script type="text/javascript"> | 346 | <script type="text/javascript"> |
155 | 350 | _uacct = "UA-343802-3"; | 347 | var _gaq = _gaq || []; |
156 | 351 | urchinTracker(); | 348 | _gaq.push(['b._setAccount', 'UA-343802-3']); |
157 | 352 | </script> | 349 | _gaq.push(['b._setDomainName', 'percona.com']); |
158 | 350 | _gaq.push(['b._trackPageview']); | ||
159 | 351 | (function() { | ||
160 | 352 | var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; | ||
161 | 353 | ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; | ||
162 | 354 | var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); | ||
163 | 355 | })(); | ||
164 | 356 | </script> | ||
165 | 357 | |||
166 | 353 | <!-- /GA //--> | 358 | <!-- /GA //--> |
167 | 354 | <!-- NAVI //--> | 359 | <!-- NAVI //--> |
168 | 355 | <script type="text/javascript">//<![CDATA[ | 360 | <script type="text/javascript">//<![CDATA[ |
170 | 356 | var navi = [{id:"menu-914", direction: "l"},{id:"menu-915", direction: "l"},{id:"menu-916", direction: "l"},{id:"menu-918", direction: "l"},{id:"menu-919", direction: "l"},{id:"menu-920", direction: "l"},{id:"menu-1060", direction: "l"}]; | 361 | var navi = [{id:"menu-914", direction: "l"},{id:"menu-915", direction: "l"},{id:"menu-1125", direction: "l"},{id:"menu-918", direction: "l"},{id:"menu-919", direction: "l"},{id:"menu-1129", direction: "l"},{id:"menu-920", direction: "l"},{id:"menu-1060", direction: "l"}]; |
171 | 357 | for(var i = 0, c = navi.length; i < c; i++) { | 362 | for(var i = 0, c = navi.length; i < c; i++) { |
173 | 358 | window.jQuery('#navilink-a-' + navi[i].id).bind('mouseover',{id: navi[i].id, direction:navi[i].direction}, function(e) { NAVI.Open(e.data.id, e.data.direction); } ); | 363 | window.jQuery('#navilink-a-' + navi[i].id).bind('mouseover',{id: navi[i].id, direction:navi[i].direction}, function(e) { NAVI.Open(e.data.id, e.data.direction); } ); |
174 | 359 | } | 364 | } |
176 | 360 | window.jQuery('#search-form').bind('submit', function() { window.location.href = jQuery('#search-form').attr('action') + jQuery('#search-input').val(); return false; }); | 365 | window.jQuery('#search-form').bind('submit', function() { window.location.href = jQuery('#search-form').attr('action') + '?s=' + jQuery('#search-input').val(); return false; }); |
177 | 366 | |||
178 | 367 | |||
179 | 361 | //]]></script> | 368 | //]]></script> |
180 | 362 | <!-- /NAVI //--> | 369 | <!-- /NAVI //--> |
181 | 363 | <script type="text/javascript"> | 370 | <script type="text/javascript"> |
182 | 364 | 371 | ||
183 | === added file 'doc/source/percona-theme/static/bullet-yellow-green.png' | |||
184 | 365 | Binary 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 09:57:22 +0000 differ | 372 | Binary 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 09:57:22 +0000 differ |
185 | === added file 'doc/source/percona-theme/static/bullet-yellow.png' | |||
186 | 366 | Binary 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 09:57:22 +0000 differ | 373 | Binary 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 09:57:22 +0000 differ |
187 | === modified file 'doc/source/percona-theme/static/percona.com.css' | |||
188 | --- doc/source/percona-theme/static/percona.com.css 2012-07-12 08:48:23 +0000 | |||
189 | +++ doc/source/percona-theme/static/percona.com.css 2014-07-30 09:57:22 +0000 | |||
190 | @@ -103,7 +103,7 @@ | |||
191 | 103 | float:left; | 103 | float:left; |
192 | 104 | overflow:hidden; | 104 | overflow:hidden; |
193 | 105 | padding:20px 0; | 105 | padding:20px 0; |
195 | 106 | width:240px; | 106 | width:220px; |
196 | 107 | zoom:1 | 107 | zoom:1 |
197 | 108 | } | 108 | } |
198 | 109 | 109 | ||
199 | @@ -112,7 +112,7 @@ | |||
200 | 112 | overflow: hidden; | 112 | overflow: hidden; |
201 | 113 | zoom: 1; | 113 | zoom: 1; |
202 | 114 | float: left; | 114 | float: left; |
204 | 115 | width: 240px; | 115 | width: 220px; |
205 | 116 | padding: 20px 0px; | 116 | padding: 20px 0px; |
206 | 117 | } | 117 | } |
207 | 118 | 118 | ||
208 | @@ -121,7 +121,7 @@ | |||
209 | 121 | overflow: hidden; | 121 | overflow: hidden; |
210 | 122 | zoom: 1; | 122 | zoom: 1; |
211 | 123 | float: left; | 123 | float: left; |
213 | 124 | width: 720px; | 124 | width: 740px; |
214 | 125 | height: 35px; | 125 | height: 35px; |
215 | 126 | padding: 30px 0px; | 126 | padding: 30px 0px; |
216 | 127 | } | 127 | } |
217 | @@ -1690,96 +1690,114 @@ | |||
218 | 1690 | /*** | 1690 | /*** |
219 | 1691 | * side style buttons | 1691 | * side style buttons |
220 | 1692 | */ | 1692 | */ |
311 | 1693 | .a-btn-container { | 1693 | .a-btn-green, .a-btn-green-big { |
312 | 1694 | overflow:hidden; | 1694 | background: #0a4200; /* Old browsers */ |
313 | 1695 | border-radius:4px; | 1695 | background: -moz-linear-gradient(top, #099b00 0%, #0a4200 100%); /* FF3.6+ */ |
314 | 1696 | } | 1696 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#099b00), color-stop(100%,#0a4200)); /* Chrome,Safari4+ */ |
315 | 1697 | .a-btn, .a-btn-new { | 1697 | background: -webkit-linear-gradient(top, #099b00 0%,#0a4200 100%); /* Chrome10+,Safari5.1+ */ |
316 | 1698 | width: 218px; | 1698 | background: -o-linear-gradient(top, #099b00 0%,#0a4200 100%); /* Opera 11.10+ */ |
317 | 1699 | height: 48px; | 1699 | background: -ms-linear-gradient(top, #099b00 0%,#0a4200 100%); /* IE10+ */ |
318 | 1700 | background: #fdcd34; | 1700 | background: linear-gradient(to bottom, #099b00 0%,#0a4200 100%); /* W3C */ |
319 | 1701 | background:-webkit-gradient(linear,left top,left bottom,color-stop(##fdcd34,0),color-stop(##d42c14,1)); | 1701 | filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#099b00', endColorstr='#0a4200',GradientType=0 ); /* IE6-9 */ |
320 | 1702 | background:-webkit-linear-gradient(top, #fdcd34 0%, #d42c14 100%); | 1702 | border: none; |
321 | 1703 | background:-moz-linear-gradient(top, #fdcd34 0%, #d42c14 100%); | 1703 | border-radius: 4px 4px 4px 4px; |
322 | 1704 | background:-o-linear-gradient(top, #fdcd34 0%, #d42c14 100%); | 1704 | display: inline-block; |
323 | 1705 | background:linear-gradient(top, #fdcd34 0%, #d42c14 100%); | 1705 | height: 65px; |
324 | 1706 | filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#fdcd34', endColorstr='#d42c14',GradientType=0 ); | 1706 | margin-bottom: 10px; |
325 | 1707 | 1707 | overflow: hidden; | |
326 | 1708 | padding:0px; | 1708 | padding: 0; |
327 | 1709 | 1709 | position: relative; | |
328 | 1710 | display:inline-block; | 1710 | text-decoration: none !important; |
329 | 1711 | position:relative; | 1711 | transition: all 0.3s linear 0s; |
330 | 1712 | -webkit-border-radius:4px; | 1712 | width: 100%; |
331 | 1713 | -moz-border-radius:4px; | 1713 | background-color:#0a4200; |
332 | 1714 | border-radius:4px; | 1714 | } |
333 | 1715 | 1715 | .a-btn-orange, .a-btn-new { | |
334 | 1716 | overflow:hidden; | 1716 | background: #bf3200; /* Old browsers */ |
335 | 1717 | -webkit-transition:all 0.3s linear; | 1717 | background: -moz-linear-gradient(top, #f17800 0%, #bf3200 100%); /* FF3.6+ */ |
336 | 1718 | -moz-transition:all 0.3s linear; | 1718 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f17800), color-stop(100%,#bf3200)); /* Chrome,Safari4+ */ |
337 | 1719 | -o-transition:all 0.3s linear; | 1719 | background: -webkit-linear-gradient(top, #f17800 0%,#bf3200 100%); /* Chrome10+,Safari5.1+ */ |
338 | 1720 | transition:all 0.3s linear; | 1720 | background: -o-linear-gradient(top, #f17800 0%,#bf3200 100%); /* Opera 11.10+ */ |
339 | 1721 | text-decoration: none !important; | 1721 | background: -ms-linear-gradient(top, #f17800 0%,#bf3200 100%); /* IE10+ */ |
340 | 1722 | border: 1px solid #f08900; | 1722 | background: linear-gradient(to bottom, #f17800 0%,#bf3200 100%); /* W3C */ |
341 | 1723 | margin-bottom: 10px; | 1723 | filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f17800', endColorstr='#bf3200',GradientType=0 ); /* IE6-9 */ |
342 | 1724 | } | 1724 | border: none; |
343 | 1725 | 1725 | border-radius: 4px 4px 4px 4px; | |
344 | 1726 | .a-btn-text{ | 1726 | display: inline-block; |
345 | 1727 | padding-left:10px; | 1727 | height: 31px; |
346 | 1728 | padding-top:5px; | 1728 | margin-bottom: 10px; |
347 | 1729 | display:block; | 1729 | overflow: hidden; |
348 | 1730 | font-size:13px; | 1730 | padding: 0; |
349 | 1731 | white-space:nowrap; | 1731 | position: relative; |
350 | 1732 | color: #ffffff; | 1732 | text-decoration: none !important; |
351 | 1733 | -webkit-transition:all 0.3s linear; | 1733 | transition: all 0.3s linear 0s; |
352 | 1734 | -moz-transition:all 0.3s linear; | 1734 | width: 100%; |
353 | 1735 | -o-transition:all 0.3s linear; | 1735 | } |
354 | 1736 | transition:all 0.3s linear; | 1736 | .a-btn-new { |
355 | 1737 | 1737 | width: 224px !important; | |
356 | 1738 | } | 1738 | } |
357 | 1739 | 1739 | .a-btn-text-green { | |
358 | 1740 | .a-btn-slide-text, .a-btn-fixed-slide-text { | 1740 | color: #FFFFFF; |
359 | 1741 | padding-left: 10px; | 1741 | display: block; |
360 | 1742 | left:0px; | 1742 | font-size: 13px; |
361 | 1743 | width:auto; | 1743 | padding-left: 15px; |
362 | 1744 | right:52px; | 1744 | padding-top: 16px; |
363 | 1745 | height:0px; | 1745 | transition: all 0.3s linear 0s; |
364 | 1746 | 1746 | white-space: nowrap; | |
365 | 1747 | color:#000000; | 1747 | } |
366 | 1748 | font-size:12px; | 1748 | .a-btn-text-orange, .a-btn-text { |
367 | 1749 | white-space:nowrap; | 1749 | color: #FFFFFF; |
368 | 1750 | font-family:Georgia, serif; | 1750 | display: block; |
369 | 1751 | font-style:italic; | 1751 | font-size: 12px; |
370 | 1752 | text-indent:15px; | 1752 | padding-left: 25px; |
371 | 1753 | overflow:hidden; | 1753 | padding-top: 8px; |
372 | 1754 | 1754 | transition: all 0.3s linear 0s; | |
373 | 1755 | 1755 | white-space: nowrap; | |
374 | 1756 | } | 1756 | } |
375 | 1757 | .a-btn-fixed-slide-text{ | 1757 | .a-btn-fixed-slide-text-green { |
376 | 1758 | height: 30px; | 1758 | color: #fbdc32; |
377 | 1759 | } | 1759 | font-family: Arial, Helvetica, sans-serif; |
378 | 1760 | 1760 | font-size: 12px; | |
379 | 1761 | .a-btn-icon-right{ | 1761 | font-style: italic; |
380 | 1762 | position:absolute; | 1762 | left: 0; |
381 | 1763 | right:0px; | 1763 | overflow: hidden; |
382 | 1764 | top:0px; | 1764 | padding-left: 14px; |
383 | 1765 | height:100%; | 1765 | right: 52px; |
384 | 1766 | width:52px; | 1766 | text-indent: 15px; |
385 | 1767 | } | 1767 | white-space: nowrap; |
386 | 1768 | 1768 | width: auto; | |
387 | 1769 | .a-btn-icon-right span{ | 1769 | line-height:20px; |
388 | 1770 | width:38px; | 1770 | } |
389 | 1771 | height:38px; | 1771 | .a-btn-icon-right-green { |
390 | 1772 | 1772 | height: 100%; | |
391 | 1773 | position:absolute; | 1773 | position: absolute; |
392 | 1774 | left:50%; | 1774 | right: 0; |
393 | 1775 | top:50%; | 1775 | top: 0; |
394 | 1776 | margin:-20px 0px 0px -20px; | 1776 | width: 52px; |
395 | 1777 | background:transparent url('button-download-icon.png') no-repeat 50% 55%; | 1777 | } |
396 | 1778 | -webkit-transition:all 0.3s linear; | 1778 | .a-btn-icon-left-green, .a-btn-icon-left-orange { |
397 | 1779 | -moz-transition:all 0.3s linear; | 1779 | height: 100%; |
398 | 1780 | -o-transition:all 0.3s linear; | 1780 | position: absolute; |
399 | 1781 | transition:all 0.3s linear; | 1781 | left: 0; |
400 | 1782 | 1782 | top: 0; | |
401 | 1783 | width: 52px; | ||
402 | 1784 | } | ||
403 | 1785 | .a-btn-icon-right-green span, .a-btn-icon-left-green span, .a-btn-icon-left-orange span { | ||
404 | 1786 | height: 38px; | ||
405 | 1787 | left: 50%; | ||
406 | 1788 | margin: -19px 0 0 -22px; | ||
407 | 1789 | position: absolute; | ||
408 | 1790 | top: 50%; | ||
409 | 1791 | transition: all 0.3s linear 0s; | ||
410 | 1792 | width: 38px; | ||
411 | 1793 | } | ||
412 | 1794 | .a-btn-icon-right-green span { | ||
413 | 1795 | background: url("bullet-yellow.png") no-repeat scroll 50% 55% transparent; | ||
414 | 1796 | margin: -19px 0 0 -22px; | ||
415 | 1797 | } | ||
416 | 1798 | .a-btn-icon-left-green span { | ||
417 | 1799 | background: url("bullet-yellow-green.png") no-repeat scroll 50% 55% transparent; | ||
418 | 1800 | margin: -20px 0 0 -17px; | ||
419 | 1783 | } | 1801 | } |
420 | 1784 | 1802 | ||
421 | 1785 | 1803 | ||
422 | 1786 | 1804 | ||
423 | === added file 'doc/source/percona-theme/static/percona_favicon.ico' | |||
424 | 1787 | Binary 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 09:57:22 +0000 differ | 1805 | Binary 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 09:57:22 +0000 differ |
425 | === modified file 'doc/source/performance/query_cache_enhance.rst' | |||
426 | --- doc/source/performance/query_cache_enhance.rst 2013-07-05 07:26:42 +0000 | |||
427 | +++ doc/source/performance/query_cache_enhance.rst 2014-07-30 09:57:22 +0000 | |||
428 | @@ -32,6 +32,8 @@ | |||
429 | 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; |
430 | 33 | 5 root localhost test Query 0 NULL | 33 | 5 root localhost test Query 0 NULL |
431 | 34 | 34 | ||
432 | 35 | .. _ignoring_comments: | ||
433 | 36 | |||
434 | 35 | Ignoring comments | 37 | Ignoring comments |
435 | 36 | ================= | 38 | ================= |
436 | 37 | 39 |