diff --git a/ChangeLog b/ChangeLog index 3d45bf7505..4c67aaadb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [gui] Navigator for the db list in the navigation panel + [gui] Navigator for the table list in the content panel - bug #1727138 HTML not encoded (more than 1000 characters) ++ [display] Support for MySQL 5.0.37 profiling 2.10.3.0 (not yet released) diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php index 42eee884d4..2c0cad4eb8 100644 --- a/lang/afrikaans-iso-8859-1.inc.php +++ b/lang/afrikaans-iso-8859-1.inc.php @@ -1050,4 +1050,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index ffcd9fb7e2..00b7446ba8 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1051,4 +1051,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php index dc27bc0e41..8dfdfb8e5c 100644 --- a/lang/albanian-iso-8859-1.inc.php +++ b/lang/albanian-iso-8859-1.inc.php @@ -1049,4 +1049,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 75c2259f80..824d4325db 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1050,4 +1050,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 0af97e1257..85a1da5f2c 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php index 91cc6b5852..8cf84a9617 100644 --- a/lang/arabic-windows-1256.inc.php +++ b/lang/arabic-windows-1256.inc.php @@ -1051,4 +1051,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php index 30d3ecd2b2..4611b8f27b 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php +++ b/lang/azerbaijani-iso-8859-9.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index e49f2ec7ee..4bd3d3d341 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php index d5de91a9ea..d9c4d9cc23 100644 --- a/lang/basque-iso-8859-1.inc.php +++ b/lang/basque-iso-8859-1.inc.php @@ -1043,4 +1043,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 6a321fa37e..1ece37d678 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1044,4 +1044,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 41f10c101a..f34d7ed5a4 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1027,4 +1027,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/belarusian_cyrillic-windows-1251.inc.php b/lang/belarusian_cyrillic-windows-1251.inc.php index 2499e76ed7..c9c8f129bf 100644 --- a/lang/belarusian_cyrillic-windows-1251.inc.php +++ b/lang/belarusian_cyrillic-windows-1251.inc.php @@ -1026,4 +1026,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 4e7ec4c7c6..d7789502fd 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1026,4 +1026,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 11126d2be0..092a8116c5 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1050,4 +1050,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php index f24aca4394..fab712ca1f 100644 --- a/lang/bosnian-windows-1250.inc.php +++ b/lang/bosnian-windows-1250.inc.php @@ -1049,4 +1049,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php index cf373e46ef..643bf7bb6f 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php @@ -1023,4 +1023,5 @@ $strYes = 'Sim'; $strZeroRemovesTheLimit = 'Nota: Ajustar essa opção para 0 (zero) remove os limites.'; $strZip = '"compactado com zip"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 77cc80c321..6c7e19ac83 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1024,4 +1024,5 @@ $strYes = 'Sim'; $strZeroRemovesTheLimit = 'Nota: Ajustar essa opção para 0 (zero) remove os limites.'; $strZip = '"compactado com zip"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php index 141aeb4815..d01b2fa8b5 100644 --- a/lang/bulgarian-koi8-r.inc.php +++ b/lang/bulgarian-koi8-r.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index a19f3cb043..0558d07143 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php index d46ad72d26..71824a2983 100644 --- a/lang/bulgarian-windows-1251.inc.php +++ b/lang/bulgarian-windows-1251.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php index 2089b82ee9..355138f462 100644 --- a/lang/catalan-iso-8859-1.inc.php +++ b/lang/catalan-iso-8859-1.inc.php @@ -1022,4 +1022,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 759643b815..d862045f8d 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1023,4 +1023,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php index cd816c6517..edc87d4a66 100644 --- a/lang/chinese_simplified-gb2312.inc.php +++ b/lang/chinese_simplified-gb2312.inc.php @@ -1051,4 +1051,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index e1e655c425..8622ea147c 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php index 7c8c33e6ab..f8b8124205 100644 --- a/lang/chinese_traditional-big5.inc.php +++ b/lang/chinese_traditional-big5.inc.php @@ -1030,4 +1030,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index fbd2ece176..fc9a84e36c 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1031,4 +1031,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php index 8f71a72ebc..68a102d154 100644 --- a/lang/croatian-iso-8859-2.inc.php +++ b/lang/croatian-iso-8859-2.inc.php @@ -1024,4 +1024,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 20084b54da..caebac738e 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1025,4 +1025,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php index a6935d774a..ec3645fb28 100644 --- a/lang/croatian-windows-1250.inc.php +++ b/lang/croatian-windows-1250.inc.php @@ -1024,4 +1024,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php index f72943324d..d49d0de1d2 100644 --- a/lang/czech-iso-8859-2.inc.php +++ b/lang/czech-iso-8859-2.inc.php @@ -1025,4 +1025,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení tìchto parametrù na 0 (nulu) odstraní omezení.'; $strZip = '„zazipováno“'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 4cd3ceeac0..998808e5b1 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1026,4 +1026,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení tÄ›chto parametrů na 0 (nulu) odstraní omezení.'; $strZip = '„zazipováno“'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php index 34be7bb56a..b370f58faa 100644 --- a/lang/czech-windows-1250.inc.php +++ b/lang/czech-windows-1250.inc.php @@ -1025,4 +1025,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení tìchto parametrù na 0 (nulu) odstraní omezení.'; $strZip = '„zazipováno“'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php index 4b76d08858..f2a33cc772 100644 --- a/lang/danish-iso-8859-1.inc.php +++ b/lang/danish-iso-8859-1.inc.php @@ -1025,4 +1025,5 @@ $strZip = '"zippet"'; $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 2c4ff461e9..fcc6d57313 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1026,4 +1026,5 @@ $strZip = '"zippet"'; $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index 63ff4f8847..c2c4d00feb 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/dutch-iso-8859-15.inc.php b/lang/dutch-iso-8859-15.inc.php index c09c952ff4..52d722ec42 100644 --- a/lang/dutch-iso-8859-15.inc.php +++ b/lang/dutch-iso-8859-15.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 4c9c2cf9b2..a9dc1cbba7 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php index 4247542bbb..3b86d1df7f 100644 --- a/lang/english-iso-8859-1.inc.php +++ b/lang/english-iso-8859-1.inc.php @@ -620,6 +620,7 @@ $strPrivilegesReloaded = 'The privileges were reloaded successfully.'; $strProcedures = 'Procedures'; $strProcesses = 'Processes'; $strProcesslist = 'Process list'; +$strProfiling = 'Profiling'; $strProtocolVersion = 'Protocol version'; $strPutColNames = 'Put fields names in the first row'; diff --git a/lang/english-iso-8859-15.inc.php b/lang/english-iso-8859-15.inc.php index 296885f19d..f14dd70ed8 100644 --- a/lang/english-iso-8859-15.inc.php +++ b/lang/english-iso-8859-15.inc.php @@ -620,6 +620,7 @@ $strPrivilegesReloaded = 'The privileges were reloaded successfully.'; $strProcedures = 'Procedures'; $strProcesses = 'Processes'; $strProcesslist = 'Process list'; +$strProfiling = 'Profiling'; $strProtocolVersion = 'Protocol version'; $strPutColNames = 'Put fields names in the first row'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index dfa6fb65f2..19171642b7 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -621,6 +621,7 @@ $strPrivilegesReloaded = 'The privileges were reloaded successfully.'; $strProcedures = 'Procedures'; $strProcesses = 'Processes'; $strProcesslist = 'Process list'; +$strProfiling = 'Profiling'; $strProtocolVersion = 'Protocol version'; $strPutColNames = 'Put fields names in the first row'; diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php index b9c45af132..e8f3296a91 100644 --- a/lang/estonian-iso-8859-1.inc.php +++ b/lang/estonian-iso-8859-1.inc.php @@ -1031,4 +1031,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 040b22228e..8702bd651b 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1032,4 +1032,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php index e1d12589b4..6a57102caf 100644 --- a/lang/finnish-iso-8859-1.inc.php +++ b/lang/finnish-iso-8859-1.inc.php @@ -1028,4 +1028,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/finnish-iso-8859-15.inc.php b/lang/finnish-iso-8859-15.inc.php index dd180973a5..d7787f6244 100644 --- a/lang/finnish-iso-8859-15.inc.php +++ b/lang/finnish-iso-8859-15.inc.php @@ -1028,4 +1028,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 11766ae97e..e18ebd94a0 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1029,4 +1029,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php index 68789e5715..570a98d346 100644 --- a/lang/french-iso-8859-1.inc.php +++ b/lang/french-iso-8859-1.inc.php @@ -1022,4 +1022,5 @@ $strZip = '"zipp $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/french-iso-8859-15.inc.php b/lang/french-iso-8859-15.inc.php index 145376f41d..a38fc4f11d 100644 --- a/lang/french-iso-8859-15.inc.php +++ b/lang/french-iso-8859-15.inc.php @@ -1022,4 +1022,5 @@ $strZip = '"zipp $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index de13438966..0b39a80562 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1023,4 +1023,5 @@ $strZip = '"zippé"'; $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php index 98abe4cd05..14bdc09990 100644 --- a/lang/galician-iso-8859-1.inc.php +++ b/lang/galician-iso-8859-1.inc.php @@ -1024,4 +1024,5 @@ $strYes = 'Si'; $strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.'; $strZip = 'comprimido no formato "zip"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 8fa493bcbe..90aa5fceb3 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1025,4 +1025,5 @@ $strYes = 'Si'; $strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.'; $strZip = 'comprimido no formato "zip"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index c98cd64d1c..c5556efaa7 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php index 79c92d3219..97b9bd2aad 100644 --- a/lang/german-iso-8859-1.inc.php +++ b/lang/german-iso-8859-1.inc.php @@ -1028,4 +1028,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/german-iso-8859-15.inc.php b/lang/german-iso-8859-15.inc.php index 9b07acce8f..bfda947bf2 100644 --- a/lang/german-iso-8859-15.inc.php +++ b/lang/german-iso-8859-15.inc.php @@ -1028,4 +1028,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 3cca99d198..0ce298bb0a 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1029,4 +1029,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php index 8f52f8f9f2..fa59d89c1d 100644 --- a/lang/greek-iso-8859-7.inc.php +++ b/lang/greek-iso-8859-7.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index dd5facc1ec..f6bb2fefd0 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1049,4 +1049,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php index b73e771123..5f33d24ac3 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php +++ b/lang/hebrew-iso-8859-8-i.inc.php @@ -1043,4 +1043,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 96d302eaca..64c24140e7 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1044,4 +1044,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 0938ab6c48..945ff61685 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php index ea485ae7f0..7393fb992e 100644 --- a/lang/hungarian-iso-8859-2.inc.php +++ b/lang/hungarian-iso-8859-2.inc.php @@ -1043,4 +1043,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index ec960a58af..52ba09d36b 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1044,4 +1044,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php index 7f142f4e3b..a26d46c14c 100644 --- a/lang/indonesian-iso-8859-1.inc.php +++ b/lang/indonesian-iso-8859-1.inc.php @@ -1041,4 +1041,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index cc1f39da04..dfd160e345 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1042,4 +1042,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php index 6f6230952c..4813c178b1 100644 --- a/lang/italian-iso-8859-1.inc.php +++ b/lang/italian-iso-8859-1.inc.php @@ -1025,4 +1025,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/italian-iso-8859-15.inc.php b/lang/italian-iso-8859-15.inc.php index 12b50c6045..3284b11907 100644 --- a/lang/italian-iso-8859-15.inc.php +++ b/lang/italian-iso-8859-15.inc.php @@ -1025,4 +1025,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index e8bf7c1631..f4d1c35cae 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1026,4 +1026,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php index 15ed987d83..24a16ca3ab 100644 --- a/lang/japanese-euc.inc.php +++ b/lang/japanese-euc.inc.php @@ -1030,4 +1030,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index 0398b0e0fa..bbcdc1d56d 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -1030,4 +1030,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 2085a0164b..bb73c3183f 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1030,4 +1030,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php index f0f8322925..0f14f82673 100644 --- a/lang/korean-euc-kr.inc.php +++ b/lang/korean-euc-kr.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 13806fc747..0aa7a00944 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index f6350dd761..b6daefefdb 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1049,4 +1049,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php index a6c6440de5..7a258c4d14 100644 --- a/lang/latvian-windows-1257.inc.php +++ b/lang/latvian-windows-1257.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 23afda0528..d8c7f3c464 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1042,4 +1042,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php index d869f00b43..a7c17d679e 100644 --- a/lang/lithuanian-windows-1257.inc.php +++ b/lang/lithuanian-windows-1257.inc.php @@ -1041,4 +1041,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index dee1d25aa1..4a797dcb2f 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1027,4 +1027,5 @@ $strUploadsNotAllowed = 'File uploads are not allowed on this server.'; //to tr $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate $strViewName = 'VIEW name'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/macedonian_cyrillic-windows-1251.inc.php b/lang/macedonian_cyrillic-windows-1251.inc.php index 70b3d7b2de..04bd26ef91 100644 --- a/lang/macedonian_cyrillic-windows-1251.inc.php +++ b/lang/macedonian_cyrillic-windows-1251.inc.php @@ -1026,4 +1026,5 @@ $strUploadsNotAllowed = 'File uploads are not allowed on this server.'; //to tr $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate $strViewName = 'VIEW name'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php index 6b48285ded..d75254d047 100644 --- a/lang/malay-iso-8859-1.inc.php +++ b/lang/malay-iso-8859-1.inc.php @@ -1063,4 +1063,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index bac195ccfd..ed1f5b9d6d 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1064,4 +1064,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 1800bb8928..a4043e70d2 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php index 1c32d2a7ff..354eb9d811 100644 --- a/lang/norwegian-iso-8859-1.inc.php +++ b/lang/norwegian-iso-8859-1.inc.php @@ -1023,4 +1023,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index baba925a1a..dabf8e4ab7 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1024,4 +1024,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index fb40ddf530..0b705643c5 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1049,4 +1049,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php index 87136c894a..b0eced8301 100644 --- a/lang/persian-windows-1256.inc.php +++ b/lang/persian-windows-1256.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php index 900fd838f9..3edf5da064 100644 --- a/lang/polish-iso-8859-2.inc.php +++ b/lang/polish-iso-8859-2.inc.php @@ -1019,4 +1019,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 13c289c42b..6d55645017 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1020,4 +1020,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/polish-windows-1250.inc.php b/lang/polish-windows-1250.inc.php index 5108f6b2d3..0e5b738daf 100644 --- a/lang/polish-windows-1250.inc.php +++ b/lang/polish-windows-1250.inc.php @@ -1019,4 +1019,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php index c207c1777a..9ce45e9c4e 100644 --- a/lang/portuguese-iso-8859-1.inc.php +++ b/lang/portuguese-iso-8859-1.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/portuguese-iso-8859-15.inc.php b/lang/portuguese-iso-8859-15.inc.php index 41d04a7780..524d810e38 100644 --- a/lang/portuguese-iso-8859-15.inc.php +++ b/lang/portuguese-iso-8859-15.inc.php @@ -1052,4 +1052,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index e26d63a5f9..a32c229cfd 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1053,4 +1053,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php index 263c5cf9cd..b77a55ccb9 100644 --- a/lang/romanian-iso-8859-1.inc.php +++ b/lang/romanian-iso-8859-1.inc.php @@ -1044,4 +1044,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 90e0792b65..951045680d 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1045,4 +1045,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php index 2b1d65b762..77c713819b 100644 --- a/lang/russian-cp-866.inc.php +++ b/lang/russian-cp-866.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php index c9476e04b4..7529cc6823 100644 --- a/lang/russian-koi8-r.inc.php +++ b/lang/russian-koi8-r.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 0be3d8e8d4..99a227c5a3 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php index 4ed820ff8a..9c62d10471 100644 --- a/lang/russian-windows-1251.inc.php +++ b/lang/russian-windows-1251.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index c1fe1cd1b0..be3b5f9b96 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php index bb5d34a7b0..6a26d27f4c 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php +++ b/lang/serbian_cyrillic-windows-1251.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index af1ab3fa02..bf4363ef71 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php index ad795bb3f4..b81d67a3fd 100644 --- a/lang/serbian_latin-windows-1250.inc.php +++ b/lang/serbian_latin-windows-1250.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 740d7c8f1e..5c650a368f 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1029,4 +1029,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php index 586c60c3a0..68ca1797bd 100644 --- a/lang/slovak-iso-8859-2.inc.php +++ b/lang/slovak-iso-8859-2.inc.php @@ -1026,4 +1026,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 53b2d4d186..7892f5a4fa 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1027,4 +1027,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php index 1cb60c9b14..1e15705a8c 100644 --- a/lang/slovak-windows-1250.inc.php +++ b/lang/slovak-windows-1250.inc.php @@ -1026,4 +1026,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php index c0b923332b..0e7a74efb3 100644 --- a/lang/slovenian-iso-8859-2.inc.php +++ b/lang/slovenian-iso-8859-2.inc.php @@ -1045,4 +1045,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 1e516eb8e7..9e18a4dcb7 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php index 699cc6c874..3f3a192a4f 100644 --- a/lang/slovenian-windows-1250.inc.php +++ b/lang/slovenian-windows-1250.inc.php @@ -1045,4 +1045,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php index 23d5e655e8..449871899c 100644 --- a/lang/spanish-iso-8859-1.inc.php +++ b/lang/spanish-iso-8859-1.inc.php @@ -1021,4 +1021,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/spanish-iso-8859-15.inc.php b/lang/spanish-iso-8859-15.inc.php index 7f9a204db5..9d7ef7b44f 100644 --- a/lang/spanish-iso-8859-15.inc.php +++ b/lang/spanish-iso-8859-15.inc.php @@ -1021,4 +1021,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 5eab856069..36a7933790 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1022,4 +1022,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php index 2d9f17b9b8..1b30fff759 100644 --- a/lang/swedish-iso-8859-1.inc.php +++ b/lang/swedish-iso-8859-1.inc.php @@ -1031,4 +1031,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 1d78389b2c..4d28d8dacb 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1032,4 +1032,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/tatarish-iso-8859-9.inc.php b/lang/tatarish-iso-8859-9.inc.php index dffea9d80e..178608c9e6 100644 --- a/lang/tatarish-iso-8859-9.inc.php +++ b/lang/tatarish-iso-8859-9.inc.php @@ -1037,4 +1037,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index e79dba3f75..b379c83c61 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1038,4 +1038,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php index b72c31ec89..d1db6554f0 100644 --- a/lang/thai-tis-620.inc.php +++ b/lang/thai-tis-620.inc.php @@ -1047,4 +1047,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index d99671c884..8b7cc9e325 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1048,4 +1048,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php index 880ada9e77..e0c9bdb023 100644 --- a/lang/turkish-iso-8859-9.inc.php +++ b/lang/turkish-iso-8859-9.inc.php @@ -1031,4 +1031,5 @@ $strYes = 'Evet'; $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0 (sýfýr)\'a ayarlanmasý sýnýrý kaldýrýr.'; $strZip = '"zip olarak"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 806ab6d03d..270f7c1508 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1032,4 +1032,5 @@ $strYes = 'Evet'; $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0 (sıfır)\'a ayarlanması sınırı kaldırır.'; $strZip = '"zip olarak"'; +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 260eea03f3..e180c68516 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1046,4 +1046,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php index fe0b078c14..3079ec0070 100644 --- a/lang/ukrainian-windows-1251.inc.php +++ b/lang/ukrainian-windows-1251.inc.php @@ -1045,4 +1045,5 @@ $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate $strRestartInsertion = 'Restart insertion with %s rows'; //to translate $strTriggers = 'Triggers'; //to translate $strEvent = 'Event'; //to translate +$strProfiling = 'Profiling'; //to translate ?> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 6a3944d867..3e539a0e80 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -864,6 +864,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { PMA_setCookie('pma_collation_connection', $GLOBALS['collation_connection']); $_SESSION['PMA_Theme_Manager']->setThemeCookie(); + + /** + * check if profiling was requested and remember it + */ + + if (PMA_MYSQL_INT_VERSION >= 50037 && isset($_REQUEST['profiling'])) { + $_SESSION['profiling'] = true; + } elseif (isset($_REQUEST['profiling_form'])) { + // the checkbox was unchecked + unset($_SESSION['profiling']); + } + } // end if !defined('PMA_MINIMUM_COMMON') if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 127bc8b2ec..b25b803d6a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1228,7 +1228,9 @@ function PMA_showMessage($message, $sql_query = null) } else { $validate_link = ''; } //validator - unset($sql_query); + + // why this? + //unset($sql_query); // Displays the message echo '
' . "\n"; @@ -1252,6 +1254,7 @@ function PMA_showMessage($message, $sql_query = null) if (!empty($edit_target)) { echo '
'; + PMA_profilingCheckbox($sql_query); echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; echo '
'; } @@ -1260,6 +1263,51 @@ function PMA_showMessage($message, $sql_query = null) } // end of the 'PMA_showMessage()' function +/** + * Displays a form with the Profiling checkbox + * + * @param string $sql_query + * @access public + * + * @author Marc Delisle + */ +function PMA_profilingCheckbox($sql_query) { + if (PMA_MYSQL_INT_VERSION >= 50037) { + echo '
' . "\n"; + echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '
' . "\n"; + } +} + +/** + * Displays the results of SHOW PROFILE + * + * @param array the results + * @access public + * + * @author Marc Delisle + */ +function PMA_profilingResults($profiling_results) { + echo '
' . $GLOBALS['strProfiling'] . '' . "\n"; + echo '' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; + + foreach($profiling_results as $one_result) { + echo ' ' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + } + echo '
' . $GLOBALS['strStatus'] . '' . $GLOBALS['strTime'] . '
' . $one_result['Status'] . '' . $one_result['Duration'] . '
' . "\n"; + echo '
' . "\n"; +} + /** * Formats $value to byte view * diff --git a/sql.php b/sql.php index 4e2c00e1e1..d6808a3e28 100644 --- a/sql.php +++ b/sql.php @@ -319,6 +319,10 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { unset($result); $num_rows = 0; } else { + if (isset($_SESSION['profiling'])) { + PMA_DBI_query('SET PROFILING=1;'); + } + // garvin: Measure query time. // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23067&atid=377411 $querytime_before = array_sum(explode(' ', microtime())); @@ -349,6 +353,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $num_rows = @PMA_DBI_affected_rows(); } + // Grabs the profiling results + if (isset($_SESSION['profiling'])) { + $profiling_results = PMA_DBI_fetch_result('SHOW PROFILE;'); + } + // Checks if the current database has changed // This could happen if the user sends a query like "USE `database`;" $res = PMA_DBI_query('SELECT DATABASE() AS \'db\';'); @@ -667,6 +676,10 @@ else { $GLOBALS['sql_query'] = $tmp_sql_query; } + if (isset($profiling_results)) { + PMA_profilingResults($profiling_results); + } + // Displays the results in a table if (empty($disp_mode)) { // see the "PMA_setDisplayMode()" function in