]> git.pld-linux.org Git - packages/mysql.git/blobdiff - response_time_distribution.patch
projects / packages / mysql.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 5.5.32
[packages/mysql.git] / response_time_distribution.patch
diff --git a/response_time_distribution.patch b/response_time_distribution.patch
index 76e6c5677dcf272854a372b3e9e3e41ca1ee0ded..603c8e802695d3967c7067fdcc563954ee4c464a 100644 (file)
--- a/response_time_distribution.patch
+++ b/response_time_distribution.patch
@@ -297,10 +297,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -343,10 +343,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -448,10 +448,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -494,10 +494,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -572,7 +572,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -588,7 +588,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -666,7 +666,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -685,7 +685,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -753,7 +753,7 @@
 +      1.000000        34           12.250000
 +    156.000000        33           77.099997
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -762,7 +762,7 @@
 +      1.000000        34           12.250000
 +    156.000000        33           77.099997
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -829,7 +829,7 @@
 +      0.001000        0             0.000000
 +      1.000000        34           12.250000
 +   1000.000000        33           77.099997
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -837,7 +837,7 @@
 +      0.001000        0             0.000000
 +      1.000000        34           12.250000
 +   1000.000000        33           77.099997
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -906,7 +906,7 @@
 +      0.001000        0             0.000000
 +      1.000000        34           12.250000
 +   1000.000000        33           77.099997
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -914,7 +914,7 @@
 +      0.001000        0             0.000000
 +      1.000000        34           12.250000
 +   1000.000000        33           77.099997
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
@@ -972,10 +972,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1018,10 +1018,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -1158,10 +1158,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1204,10 +1204,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -1255,10 +1255,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1301,10 +1301,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -1441,10 +1441,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1487,10 +1487,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -1511,7 +1511,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1527,7 +1527,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -1637,7 +1637,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1653,7 +1653,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -1677,7 +1677,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1696,7 +1696,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -1809,7 +1809,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1828,7 +1828,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -1842,7 +1842,7 @@
 +      1.000000        0             0.000000
 +    156.000000        0             0.000000
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1851,7 +1851,7 @@
 +      1.000000        0             0.000000
 +    156.000000        0             0.000000
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -1954,7 +1954,7 @@
 +      1.000000        11            4.050000
 +    156.000000        11           25.699999
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1963,7 +1963,7 @@
 +      1.000000        11            4.050000
 +    156.000000        11           25.699999
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -1976,7 +1976,7 @@
 +      0.001000        0             0.000000
 +      1.000000        0             0.000000
 +   1000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -1984,7 +1984,7 @@
 +      0.001000        0             0.000000
 +      1.000000        0             0.000000
 +   1000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -2086,7 +2086,7 @@
 +      0.001000        0             0.000000
 +      1.000000        11            4.050000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2094,7 +2094,7 @@
 +      0.001000        0             0.000000
 +      1.000000        11            4.050000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2109,7 +2109,7 @@
 +      0.001000        0             0.000000
 +      1.000000        0             0.000000
 +   1000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2117,7 +2117,7 @@
 +      0.001000        0             0.000000
 +      1.000000        0             0.000000
 +   1000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
 +SET SESSION query_exec_time=0.31;
@@ -2219,7 +2219,7 @@
 +      0.001000        0             0.000000
 +      1.000000        11            4.050000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2227,7 +2227,7 @@
 +      0.001000        0             0.000000
 +      1.000000        11            4.050000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
@@ -2317,10 +2317,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2363,10 +2363,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2441,10 +2441,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2487,10 +2487,10 @@
 + 131072.000000        0             0.000000
 + 262144.000000        0             0.000000
 + 524288.000000        0             0.000000
-+ 1048576.00000        0             0.000000
-+ 2097152.00000        0             0.000000
-+ 4194304.00000        0             0.000000
-+ 8388608.00000        0             0.000000
++1048576.000000        0             0.000000
++2097152.000000        0             0.000000
++4194304.000000        0             0.000000
++8388608.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2538,7 +2538,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2554,7 +2554,7 @@
 +   1000.000000        0             0.000000
 +  10000.000000        0             0.000000
 + 100000.000000        0             0.000000
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2605,7 +2605,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2624,7 +2624,7 @@
 +  16807.000000        0             0.000000
 + 117649.000000        0             0.000000
 + 823543.000000        0             0.000000
-+ 5764801.00000        0             0.000000
++5764801.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2665,7 +2665,7 @@
 +      1.000000        55            8.450000
 +    156.000000        11           25.699999
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2674,7 +2674,7 @@
 +      1.000000        55            8.450000
 +    156.000000        11           25.699999
 +  24336.000000        0             0.000000
-+ 3796416.00000        0             0.000000
++3796416.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2714,7 +2714,7 @@
 +      0.001000        0             0.000000
 +      1.000000        55            8.450000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2722,7 +2722,7 @@
 +      0.001000        0             0.000000
 +      1.000000        55            8.450000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET SESSION query_exec_time=0.1;
@@ -2764,7 +2764,7 @@
 +      0.001000        0             0.000000
 +      1.000000        55            8.450000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 +time  count   total
@@ -2772,7 +2772,7 @@
 +      0.001000        0             0.000000
 +      1.000000        55            8.450000
 +   1000.000000        11           25.699999
-+ 1000000.00000        0             0.000000
++1000000.000000        0             0.000000
 +TOO LONG      0       TOO LONG
 +SET SESSION query_exec_time=default;
 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
@@ -2886,7 +2886,7 @@
 +2010-09-15 add column 'total'
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
                 message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
                 mysqld.cc net_serv.cc  keycaches.cc
                 ../sql-common/client_plugin.c
@@ -2895,7 +2895,7 @@
                 ../sql-common/pack.c parse_file.cc password.c procedure.cc 
                 protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc 
                 slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc 
-@@ -59,7 +59,7 @@
+@@ -60,7 +60,7 @@
                 sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h 
                 sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc 
                 sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc 
@@ -2935,7 +2935,7 @@
  #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
  #include "../storage/perfschema/pfs_server.h"
  #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
-@@ -611,7 +613,7 @@
+@@ -615,7 +617,7 @@
  MY_LOCALE *my_default_lc_messages;
  MY_LOCALE *my_default_lc_time_names;
  
@@ -2944,7 +2944,7 @@
  SHOW_COMP_OPTION have_geometry, have_rtree_keys;
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_profiling;
-@@ -912,6 +914,10 @@
+@@ -917,6 +919,10 @@
  my_bool opt_enable_shared_memory;
  HANDLE smem_event_connect_request= 0;
  #endif
@@ -2955,7 +2955,7 @@
  
  my_bool opt_use_ssl  = 0;
  char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ssl_cert= NULL,
-@@ -1483,6 +1489,9 @@
+@@ -1488,6 +1494,9 @@
    my_free(opt_bin_logname);
    bitmap_free(&temp_pool);
    free_max_user_conn();
@@ -2965,7 +2965,7 @@
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -4010,6 +4019,9 @@
+@@ -3860,6 +3869,9 @@
    if (!DEFAULT_ERRMSGS[0][0])
      unireg_abort(1);  
  
@@ -2975,7 +2975,7 @@
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
    {
-@@ -6905,6 +6917,11 @@
+@@ -6773,6 +6785,11 @@
  #else
    have_query_cache=SHOW_OPTION_NO;
  #endif
@@ -3002,7 +3002,7 @@
  extern bool in_bootstrap;
 --- /dev/null
 +++ b/sql/query_response_time.cc
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,302 @@
 +#include "mysql_version.h"
 +#include "my_global.h"
 +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
@@ -3021,7 +3021,6 @@
 +#define MAXIMUM_BASE QRT_MAXIMUM_BASE
 +#define POSITIVE_POWER_FILLER QRT_POSITIVE_POWER_FILLER
 +#define NEGATIVE_POWER_FILLER QRT_NEGATIVE_POWER_FILLER
-+#define STRING_OVERFLOW QRT_STRING_OVERFLOW
 +#define TIME_OVERFLOW   QRT_TIME_OVERFLOW
 +#define DEFAULT_BASE    QRT_DEFAULT_BASE
 +
@@ -3142,20 +3141,13 @@
 +  ulonglong m_bound[OVERALL_POWER_COUNT];
 +};
 +
-+void print_time(char* buffer, std::size_t buffer_size, std::size_t string_positive_power_length, const char* format, uint64 value)
++static
++void print_time(char* buffer, std::size_t buffer_size, const char* format,
++                uint64 value)
 +{
-+  memset(buffer,'X',buffer_size);
-+  buffer[string_positive_power_length]= '.';
 +  ulonglong second=      (value / MILLION);
 +  ulonglong microsecond= (value % MILLION);
-+  std::size_t result_length= snprintf(buffer,buffer_size,format,second,microsecond);
-+  if(result_length < 0)
-+  {
-+    assert(sizeof(STRING_OVERFLOW) <= buffer_size);
-+    memcpy(buffer, STRING_OVERFLOW, sizeof(STRING_OVERFLOW));
-+    return;
-+  }
-+  buffer[result_length]= 0;
++  my_snprintf(buffer, buffer_size, format, second, microsecond);
 +}
 +
 +class time_collector
@@ -3172,14 +3164,14 @@
 +  uint32 count(uint index) const
 +  {
 +    my_atomic_rwlock_rdlock(&time_collector_lock);
-+    uint32 result= my_atomic_load32((volatile int32*)&m_count[index]);
++    uint32 result= my_atomic_load32((int32*)&m_count[index]);
 +    my_atomic_rwlock_rdunlock(&time_collector_lock);
 +    return result;
 +  }
 +  uint64 total(uint index) const
 +  {
 +    my_atomic_rwlock_rdlock(&time_collector_lock);
-+    uint64 result= my_atomic_load64((volatile int64*)&m_total[index]);
++    uint64 result= my_atomic_load64((int64*)&m_total[index]);
 +    my_atomic_rwlock_rdunlock(&time_collector_lock);
 +    return result;
 +  }
@@ -3199,8 +3191,8 @@
 +      if(m_utility->bound(i) > time)
 +      {
 +        my_atomic_rwlock_wrlock(&time_collector_lock);
-+        my_atomic_add32((volatile int32*)(&m_count[i]), 1);
-+        my_atomic_add64((volatile int64*)(&m_total[i]), time);
++        my_atomic_add32((int32*)(&m_count[i]), 1);
++        my_atomic_add64((int64*)(&m_total[i]), time);
 +        my_atomic_rwlock_wrunlock(&time_collector_lock);
 +        break;
 +      }
@@ -3212,8 +3204,8 @@
 +  used on architectures that do not have atomic implementation of atomic
 +  operations. */
 +  my_atomic_rwlock_t time_collector_lock;
-+  volatile uint32   m_count[OVERALL_POWER_COUNT + 1];
-+  volatile uint64   m_total[OVERALL_POWER_COUNT + 1];
++  uint32   m_count[OVERALL_POWER_COUNT + 1];
++  uint64   m_total[OVERALL_POWER_COUNT + 1];
 +};
 +
 +class collector
@@ -3248,8 +3240,8 @@
 +      }
 +      else
 +      {
-+        print_time(time,sizeof(time),TIME_STRING_POSITIVE_POWER_LENGTH,TIME_STRING_FORMAT,this->bound(i));
-+        print_time(total,sizeof(total),TOTAL_STRING_POSITIVE_POWER_LENGTH,TOTAL_STRING_FORMAT,this->total(i));
++        print_time(time, sizeof(time), TIME_STRING_FORMAT, this->bound(i));
++        print_time(total, sizeof(total), TOTAL_STRING_FORMAT, this->total(i));
 +      }
 +      fields[0]->store(time,strlen(time),system_charset_info);
 +      fields[1]->store(this->count(i));
@@ -3315,7 +3307,7 @@
 +#endif // HAVE_RESPONSE_TIME_DISTRIBUTION
 --- /dev/null
 +++ b/sql/query_response_time.h
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,64 @@
 +#ifndef QUERY_RESPONSE_TIME_H
 +#define QUERY_RESPONSE_TIME_H
 +
@@ -3348,18 +3340,13 @@
 +  and number 7234 result is:
 +  '   7234'
 +*/
-+#define QRT_POSITIVE_POWER_FILLER " "
++#define QRT_POSITIVE_POWER_FILLER ""
 +/*
 +  Filler for fractional number. Similiary to whole number
 +*/
 +#define QRT_NEGATIVE_POWER_FILLER "0"
 +
 +/*
-+  Message if string overflow (string overflow - internal error, this string say about bug in QRT)
-+*/
-+#define QRT_STRING_OVERFLOW "TOO BIG STRING"
-+
-+/*
 +  Message if time too big for statistic collecting (very long query)
 +*/
 +#define QRT_TIME_OVERFLOW "TOO LONG"
@@ -3368,13 +3355,11 @@
 +
 +#define QRT_TIME_STRING_LENGTH                                \
 +  max( (QRT_TIME_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TIME_STRING_NEGATIVE_POWER_LENGTH*/), \
-+       max( (sizeof(QRT_TIME_OVERFLOW) - 1),          \
-+          (sizeof(QRT_STRING_OVERFLOW) - 1) ) )
++       (sizeof(QRT_TIME_OVERFLOW) - 1) )
 +
 +#define QRT_TOTAL_STRING_LENGTH                               \
 +  max( (QRT_TOTAL_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TOTAL_STRING_NEGATIVE_POWER_LENGTH*/), \
-+       max( (sizeof(QRT_TIME_OVERFLOW) - 1),          \
-+          (sizeof(QRT_STRING_OVERFLOW) - 1) ) )
++       (sizeof(QRT_TIME_OVERFLOW) - 1) )
 +
 +extern ST_SCHEMA_TABLE query_response_time_table;
 +
@@ -3389,7 +3374,7 @@
 +#endif // QUERY_RESPONSE_TIME_H
 --- a/sql/set_var.h
 +++ b/sql/set_var.h
-@@ -293,6 +293,7 @@
+@@ -294,6 +294,7 @@
  
  extern SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen;
  extern SHOW_COMP_OPTION have_query_cache;
@@ -3407,7 +3392,7 @@
  #include "transaction.h"
  #include "sql_audit.h"
  #include "sql_prepare.h"
-@@ -1507,6 +1508,12 @@
+@@ -1518,6 +1519,12 @@
  
    ulonglong end_utime_of_query= thd->current_utime();
    ulonglong query_exec_time= get_query_exec_time(thd, end_utime_of_query);
@@ -3420,7 +3405,7 @@
  
    /*
      Low long_query_time value most likely means user is debugging stuff and even
-@@ -1671,6 +1678,7 @@
+@@ -1682,6 +1689,7 @@
    case SCH_CHARSETS:
    case SCH_ENGINES:
    case SCH_COLLATIONS:
@@ -3439,7 +3424,7 @@
  
  /**
    Reload/resets privileges and the different caches.
-@@ -296,6 +296,12 @@
+@@ -322,6 +322,12 @@
  #endif
   if (options & REFRESH_USER_RESOURCES)
     reset_mqh((LEX_USER *) NULL, 0);             /* purecov: inspected */
@@ -3501,7 +3486,7 @@
  %token  QUICK
  %token  RANGE_SYM                     /* SQL-2003-R */
  %token  READS_SYM                     /* SQL-2003-R */
-@@ -11099,6 +11100,15 @@
+@@ -11105,6 +11106,15 @@
            {
              Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
            }
@@ -3517,7 +3502,7 @@
          | CREATE PROCEDURE_SYM sp_name
            {
              LEX *lex= Lex;
-@@ -11338,6 +11348,12 @@
+@@ -11344,6 +11354,12 @@
              Lex->type|= REFRESH_SLAVE;
              Lex->reset_slave_info.all= false;
            }
@@ -3530,7 +3515,7 @@
          | MASTER_SYM
            { Lex->type|= REFRESH_MASTER; }
          | DES_KEY_FILE
-@@ -12645,6 +12661,7 @@
+@@ -12651,6 +12667,7 @@
          | PROXY_SYM                {}
          | QUARTER_SYM              {}
          | QUERY_SYM                {}
@@ -3540,15 +3525,15 @@
          | REBUILD_SYM              {}
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -49,6 +49,7 @@
- #include "../storage/perfschema/pfs_server.h"
- #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
+@@ -51,6 +51,7 @@
+ 
+ TYPELIB bool_typelib={ array_elements(bool_values)-1, "", bool_values, 0 };
  
 +#include "query_response_time.h" 
  /*
    This forward declaration is needed because including sql_base.h
    causes further includes.  [TODO] Eliminate this forward declaration
-@@ -1860,6 +1861,26 @@
+@@ -1939,6 +1940,26 @@
         DEFAULT(FALSE));
  #endif /* HAVE_QUERY_CACHE */
  
@@ -3582,7 +3567,7 @@
 +have_response_time_distribution       YES
 --- a/include/atomic/x86-gcc.h
 +++ b/include/atomic/x86-gcc.h
-@@ -108,27 +108,22 @@
+@@ -108,27 +108,23 @@
    v=tmp;
  
  /*
@@ -3608,22 +3593,23 @@
 -                : "c" (&set), "m" (*a)                            \
 -                : "memory", "esp")
 +#define make_atomic_cas_body64                                     \
-+  asm ("movl %%edi, -4(%%esp);"                                    \
-+       "leal %0, %%edi;"                                           \
-+       "xchgl %%ebx, %%esi;"                                       \
-+       LOCK_prefix "; cmpxchg8b (%%edi);"                          \
-+       "movl %%esi, %%ebx;"                                        \
-+       "movl -4(%%esp), %%edi;"                                    \
-+       "setz %1;"                                                  \
-+       : "+m" (*a), "=q" (ret), "+A" (*cmp)                        \
-+       : "S" ((int32)(set & 0xFFFFFFFF)), "c" ((int32)(set >> 32)) \
-+       : "flags")
++  asm volatile ("movl %%edi, -4(%%esp);"                           \
++                "leal %0, %%edi;"                                  \
++                "xchgl %%ebx, %%esi;"                              \
++                LOCK_prefix "; cmpxchg8b (%%edi);"                 \
++                "movl %%esi, %%ebx;"                               \
++                "movl -4(%%esp), %%edi;"                           \
++                "setz %1;"                                         \
++                : "+m" (*a), "=q" (ret), "+A" (*cmp)               \
++                : "S" ((int32)(set & 0xFFFFFFFF)),                 \
++                  "c" ((int32)(set >> 32))                         \
++                : "memory", "flags")
  #endif
  
  /*
 --- a/mysql-test/r/mysqld--help-notwin.result
 +++ b/mysql-test/r/mysqld--help-notwin.result
-@@ -503,6 +503,12 @@
+@@ -505,6 +505,12 @@
   Invalidate queries in query cache on LOCK for write
   --query-prealloc-size=# 
   Persistent buffer for query parsing and execution
@@ -3636,7 +3622,7 @@
   --range-alloc-block-size=# 
   Allocation block size for storing ranges during
   optimization
-@@ -936,6 +942,8 @@
+@@ -939,6 +945,8 @@
  query-cache-type ON
  query-cache-wlock-invalidate FALSE
  query-prealloc-size 8192
MySQL: a very fast and reliable SQL database engine
This page took 0.095533 seconds and 4 git commands to generate.