Commit Graph

286 Commits

Author SHA1 Message Date
Michal Čihař
bb5fe3f2d6 Factor out refresh rate selection and use ngettext for it 2011-06-17 10:35:23 +02:00
Michal Čihař
75f916fd3c Merge remote-tracking branch 'tyron/master'
Conflicts:
	server_status.php
2011-06-17 09:11:36 +02:00
Piotr Przybylski
d607fa3e5c Make live query chart work in Drizzle 2011-06-16 23:12:06 +02:00
Tyron Madlener
14f8664272 some more code formatting 2011-06-16 15:18:24 +02:00
Tyron Madlener
ab5d9b278a Cleaned up code 2011-06-16 15:03:04 +02:00
Piotr Przybylski
76dde71244 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-15 23:30:21 +02:00
Piotr Przybylski
2c97f4b326 Server status: add a filter category for not-matched variable name prefixes (currently 10 variables in MySQL and Drizzle) 2011-06-15 23:06:45 +02:00
Piotr Przybylski
2ceb7588b5 Status tab: hide unused categories in filter list 2011-06-15 23:01:18 +02:00
Piotr Przybylski
a5342c70ea Server Status: remove warnings, make process list and query stats work (Drizzle) 2011-06-15 22:53:55 +02:00
Michal Čihař
163d929abb Merge remote-tracking branch 'tyron/master' 2011-06-15 22:48:05 +02:00
Tyron Madlener
0aa13c5497 No php5.3 dependency & fixes ajax requests broken 2011-06-15 19:20:19 +02:00
Michal Čihař
f05a988b86 Whitespace cleanup 2011-06-15 15:50:56 +02:00
Michal Čihař
1baf5c7e4c Send correct mime type (the reply is actually HTML) 2011-06-15 15:50:49 +02:00
Michal Čihař
f79a619326 Merge remote-tracking branch 'tyron/master'
Conflicts:
	server_status.php
2011-06-15 15:46:11 +02:00
Tyron Madlener
14cacc70ac Send correct charset header with ajax responses 2011-06-15 14:37:08 +02:00
Michal Čihař
ba8e434a99 Merge remote-tracking branch 'tyron/master'
Conflicts:
	server_status.php
2011-06-15 07:49:56 +02:00
Tyron Madlener
2216824c90 - Newest canvg version from trunk fixing display of hidden elements
- Some attempts to get png export working for IE8 (needs flashcanvas)
2011-06-14 20:55:37 +02:00
Michal Čihař
d404fd72d6 Merge remote-tracking branch 'tyron/master'
Conflicts:
	server_status.php
2011-06-14 17:21:30 +02:00
Tyron Madlener
a3510734b1 merge conflicts 2011-06-14 17:19:40 +02:00
Tyron Madlener
9409b76db6 Merge remote-tracking branch 'origin/master'
Conflicts:
	server_status.php
2011-06-14 17:16:26 +02:00
Michal Čihař
4b73c39775 Always use long <?php tags 2011-06-14 14:21:48 +02:00
Tyron Madlener
d26cace15b Traffic charting for traffic tab on status page 2011-06-13 23:36:07 +02:00
Tyron Madlener
c9ea04a046 Status variables refresh link once again broken 2011-06-13 21:28:27 +02:00
Tyron Madlener
5ee9a1fe1a Assures that process table is below traffic/connection tables, not beside 2011-06-13 18:14:57 +02:00
Tyron Madlener
21246070fa Some style fixes mostly for original theme 2011-06-13 16:55:49 +02:00
Tyron Madlener
9db1342b2a Bug Fixes 2011-06-13 16:45:31 +02:00
Tyron Madlener
da8124e689 Fixed refresh in variables tab 2011-06-10 19:44:33 +02:00
Tyron Madlener
3ce1e7f759 Small improvements 2011-06-10 19:26:29 +02:00
Tyron Madlener
2bf553247b Clear timeout once refresh rate has changed and display what the select list is for 2011-06-10 15:35:51 +02:00
Tyron Madlener
bccbff41ae Configurable refresh rate for real-time charts in the status page 2011-06-10 15:17:52 +02:00
Tyron Madlener
831da843c1 Fixes of some bugs 2011-06-09 20:08:17 +02:00
Tyron Madlener
855532ea2e replace pChart with highchart for the query statistics 2011-06-07 14:54:51 +02:00
Tyron Madlener
775beaca22 More secure chart export 2011-06-06 15:26:06 +02:00
Tyron Madlener
9abc87d3a5 Connection / Process charting on the server traffic tab 2011-06-06 13:50:17 +02:00
Tyron Madlener
9fdbb850bb Proof of concept for svg->canvas->image export of charts 2011-06-02 22:00:42 +02:00
Tyron Madlener
71cc8fec3d - Query chart:
- Point tooltip now shows what type of queries have been issued
 - Changed data from 'Seconds per Query' to 'Seconds since last refresh'
2011-06-01 17:49:27 +02:00
Tyron Madlener
8d5850674b Sorting indicators in the column headers 2011-05-31 15:50:50 +02:00
Tyron Madlener
3adc27ec81 A bit better number formatting for the query statistics table 2011-05-31 12:03:57 +02:00
Tyron Madlener
4885b174da - Implemented more reusable code for realtime charting
- added 'queries per second' chart in the query statistics tab
- removed test chart
- fixed kill process url
2011-05-30 22:37:18 +02:00
Tyron Madlener
58da05381c Added realtime charting of processes with the highcart lib for testing 2011-05-30 17:01:09 +02:00
unknown
4a788b1505 Small adjustments 2011-05-27 19:34:53 +02:00
tyron
1a4fc3b879 More wrong variable scoping 2011-05-24 20:48:21 +02:00
tyron
7a82a65c4e Fixed wrong variable scoping 2011-05-24 20:45:44 +02:00
tyron
b37f788a0b Fix for bug #3242060. Total sum of queries sums up all Com_ vars instead of using the Questions var 2011-05-24 20:41:07 +02:00
tyron
cd17b9721b Ajax refresh for all tabs now 2011-05-24 18:29:27 +02:00
tyron
c3dda3823a Fixed caching bug, added ajax refresh for variables table 2011-05-24 15:58:19 +02:00
tyron
e52393015f 2 Bugfixes 2011-05-20 00:24:52 +02:00
tyron
58f6523c57 - Server variable Filtering by category
- Some fixes and style improvements
- Tablesorting (sorting indicators are currently missing though)
2011-05-19 23:19:59 +02:00
tyron
d10e62ca37 Added variable filtering for the 'Variables' Page 2011-05-18 14:25:15 +02:00
tyron
c0749d5563 Organized tables into jQuery tabs to reduce odd scrolling effects when filtering variables 2011-05-18 13:17:47 +02:00
tyron
f8656fb0f8 Ajax loaded chart didn't remove zero values; filtered values have correct odd/even colored rows 2011-05-16 20:22:22 +02:00
tyron
0839be45a5 Status variables in one table, that can be filtered as-you-type with javascript also the query chart is loaded with ajax now. Both features degrade gracefully for non JS users. 2011-05-16 15:34:57 +02:00
Piotr Przybylski
52299e0658 Drizzle-compatible Status tab 2011-04-06 15:40:58 +02:00
Madhura Jayaratne
326f13827b Do not highlight rows of these tables 2011-03-15 20:35:53 +05:30
Michal Čihař
87b0c30747 Better sort some status variables 2011-01-28 11:06:44 +01:00
Michal Čihař
39bc66df25 rfe #1954161 [interface] Do not display long numbers in server status.
Fixed again, hopefully this way will work better.
2011-01-28 09:55:20 +01:00
Michal Čihař
311fd3b7cb Add another link to documentation 2011-01-28 09:36:36 +01:00
Michal Čihař
d50215684a [interface] Add link to documentation for status variables. 2011-01-28 09:28:59 +01:00
Dieter Adriaenssens
08701a59ce query chart : improve message layout and remove disable link 2010-12-06 21:21:24 +01:00
Dieter Adriaenssens
7dcd159da6 bug #3119882, Display query chart on demand 2010-12-04 15:12:45 +01:00
Dieter Adriaenssens
d370730eff bug #3119874, Show integers without decimals on status page 2010-12-04 14:13:51 +01:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local
Conflicts:
	server_status.php
2010-07-29 14:14:26 +03:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Martynas Mickevicius
b7daf5d985 removed overlib dependancy. Written simple tooltip. 2010-07-23 16:53:46 +03:00
Martynas Mickevicius
bcbd662f48 added tooltip JS includes for other chart places. 2010-07-21 19:35:15 +03:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Martynas Mickevicius
d1708970d6 moved chart dependant code to the chart lib. 2010-06-17 17:10:19 +03:00
Martynas Mickevicius
473b9b38dc fixed the layout of the chart in the server status page 2010-06-15 20:13:12 +03:00
Martynas Mickevicius
9e25d0536d implementation of the pie chart using OFC 2010-06-14 23:36:52 +03:00
ninadsp
834b36bd6a Merge remote branch 'origin/master' 2010-06-09 22:49:38 +05:30
Marc Delisle
5ed4790db0 move remaining old-format messages to the script that uses them, when possible 2010-06-08 12:32:18 -04:00
Martynas Mickevicius
61e00e523e file placeholder creation. Will build on top of these. 2010-06-04 16:19:55 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Michal Čihař
6940bed8fa Allow to translate master/slave strings too. 2010-05-04 10:37:01 +02:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Dieter Adriaenssens
20a402ba29 Merge branch 'QA_3_3' 2010-04-01 21:07:09 +02:00
Dieter Adriaenssens
366d50a79b Properly format server status parameter 2010-04-01 20:50:03 +02:00
Michal Čihař
a5b910f0c5 rfe #1435032 [interface] Move SSL status to the end, it is usually empty. 2010-01-21 14:20:28 +00:00
Michal Čihař
bc97eaeb2d + rfe #1954161 [interface] Do not display long numbers in server status. 2010-01-21 13:48:40 +00:00
Marc Delisle
6d9b602b87 bug #2931939 Seeing "m" as unit is confusing 2010-01-19 19:40:20 +00:00
Marc Delisle
a4aea21d00 bug #2931939 Seeing "m" as unit is confusing 2010-01-19 19:40:20 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
729cc71cd5 rfe #2862575 [status] Order query statistics by % desc, skip rows with 0 2009-11-01 12:28:21 +00:00
Herman van Rink
d972ed5d03 Fix indentation for gsoc replication code
make it match the included modeline, and fixed some other spacing issues
2009-09-07 15:00:22 +00:00
Tomas Srnka
feb562e77b Replication support - tomas_zahra branch merged 2009-08-30 14:54:36 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
9a994756f8 Incorrect display in replication status 2009-06-18 16:36:37 +00:00
Marc Delisle
e1a3ecff6f patch #2735162 [status] Server status - replication 2009-04-19 12:01:48 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Michal Čihař
6a638ee908 Ignore some defines which configure what will be included. 2008-11-24 10:07:49 +00:00
Marc Delisle
0df6102471 bug #1811527 [display] Problem with links to the MySQL manual 2007-10-22 12:15:53 +00:00
Sebastian Mendel
ef7a052074 - fixed XSS in server_status.php, thanks to Omer Singer, The DigiTrust Group
- fixed some possible XSS with PHP_SELF (PATH_INFO)
- commented out some use of PATH_INFO ... needs further testing
2007-10-16 07:11:28 +00:00
Sebastian Mendel
9f6d5979db removed MySQL < 5 code 2007-10-02 10:15:06 +00:00
Marc Delisle
af3dddae08 problem linking to InnoDB info from Status page; problem showing InnoDB engine info 2007-06-07 00:23:33 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
4a4b02b12e use PMA_getenv('PHP_SELF') 2007-03-02 15:10:40 +00:00
Marc Delisle
4f9477eb92 explanation, thanks Sebastian 2007-03-01 19:54:51 +00:00
Marc Delisle
ee177221f6 bug #1665930, undefined PHP_SELF 2007-02-25 13:18:31 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Sebastian Mendel
6e2ee9e001 - RFE #1434196 More significant digits in /status
- replaced number_format() with PMA_formatNumber()
- coding standards
2006-02-20 10:07:10 +00:00
Sebastian Mendel
15b490cfc4 fixed bug: high ascii char in preg_match 2006-01-25 08:16:40 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Marc Delisle
ab7ceec268 patch #1395031, not proper URL encoding 2006-01-04 18:23:15 +00:00
Marc Delisle
1af079fe3f bug #1348249, new message strStatisticsOverrun 2005-12-21 20:16:39 +00:00
Sebastian Mendel
1a00815881 sorry ... again 2005-11-26 06:09:21 +00:00
Michal Čihař
6aeabf44d1 Move footer.inc.php, header.inc.php and header_printview.inc.php to libraries folder as it does not require direct access. 2005-11-24 09:12:17 +00:00
Michal Čihař
66aa9d2396 Move server_{links,common}.inc.php to libraries folder as it does not require direct access. 2005-11-24 08:29:44 +00:00
Sebastian Mendel
fcf387bc70 common.lib.php should REALLY REALLY and ALWAYS be the first include 2005-11-18 12:50:49 +00:00
Michal Čihař
72ca7ecf9a Drop $cfg['ShowMysqlInfo'] and $cfg['ShowMysqlVars'] and show info in all cases. Drop $is_superuser condition from showing php info. 2005-11-13 21:04:50 +00:00
Sebastian Mendel
2d6e0f00d8 [XSS] clean $_SERVER variables 2005-10-27 17:03:36 +00:00
Sebastian Mendel
d76b1a831c css cleanup 2005-10-20 14:05:30 +00:00
Sebastian Mendel
9a4b880705 XHTML compl. 2005-10-12 15:10:34 +00:00
Michal Čihař
60e43c3e04 Call sql.php directly, we don't need to care about query splitting done im read_dump. 2005-10-08 09:53:04 +00:00
Michal Čihař
fe75253e41 Separate some new information on MySQL 5. 2005-09-27 10:57:06 +00:00
Michal Čihař
64bd56dfba Support for browsing selected columns (RFE #1275909). 2005-09-26 19:03:11 +00:00
Marc Delisle
5a94e9b78b bug #1193225 missing closing tag 2005-05-01 12:44:10 +00:00
Alexander M. Turek
8259bb9678 InnoDB buffer pool activity statistics 2005-03-06 01:07:14 +00:00
Michal Čihař
67d35fc6af Work better in ANSI mode (bug #816858). 2004-10-19 14:25:57 +00:00
Michal Čihař
ca5b16f654 Change look of adding fields into table (bug #991095).
I again did some XHTML validation, so removed few of most obvious errors, but there are still many, mostly missing alt attributtes for images and wrongly nested tags.
2004-08-12 15:13:20 +00:00
Marc Delisle
d9a21610d1 redesign part 3 2004-06-13 21:39:08 +00:00
Michal Čihař
1aaa89fa54 Little code reorganistaion (RFE #957308), removed some remaining php3 compatibility code in SQL parser. 2004-05-20 16:14:13 +00:00
Michal Čihař
850741a174 Be valid XHTML 1.0 2004-04-27 12:55:53 +00:00
Alexander M. Turek
2915b5c3ce Added MySQLi library; Removed calls to old mysql_wrappers library. 2004-01-22 02:13:48 +00:00
Marc Delisle
f8d049ace5 use PMA_DBI function 2004-01-20 20:24:00 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
d24893eb67 Final batch of PHP3-Compatibility fixes. Please test. :-) 2003-11-22 20:57:48 +00:00
Garvin Hicking
c2b46ac945 Final batch of PHP3-Compatibility fixes. Please test. :-) 2003-11-22 20:57:48 +00:00
Alexander M. Turek
3412621f5b Removed some php 3 / MySQL 3.21 compatibility code. 2003-11-20 21:50:37 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00