Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~percona-dev/percona-server/release-5.1.47-11-microseconds_in_slow_query_log_2 into lp:percona-server/release-5.1.47-11

  1. release-5.1.47-11-microseconds_in_slow_query_log_2
  2. Merge into release-5.1.47-11
Proposed by Oleg Tsarev
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 26
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-microseconds_in_slow_query_log_2
Merge into: lp:percona-server/release-5.1.47-11
Diff against target: 115 lines (+25/-12)
3 files modified
microseconds_in_slow_query_log.patch (+21/-8)
mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result (+2/-2)
mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test (+2/-2)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-microseconds_in_slow_query_log_2
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Review via email: mp+26620@code.launchpad.net

Description of the change

1) rename flag microseconds_in_slow_query_log to slow_query_log_microseconds_timestamp
2) add info about patch

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

to slow_query_log_microseconds_timestamp, of course

Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'microseconds_in_slow_query_log.patch'
2--- microseconds_in_slow_query_log.patch 2010-06-01 10:44:15 +0000
3+++ microseconds_in_slow_query_log.patch 2010-06-02 18:12:26 +0000
4@@ -1,3 +1,16 @@
5+diff -Nur /dev/null b/patch_info/microseconds_in_slow_query_log.patch
6+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
7++++ b/patch_info/microseconds_in_slow_query_log.patch 2010-06-02 22:00:00.000000000 +0900
8+@@ -0,0 +1,9 @@
9++File=microseconds_in_slow_query_log.patch
10++Name=Allow microsecond time precision in in slow.log (not InnoDB part)
11++Version=1.0
12++Author=Percona <info@percona.com>
13++License=GPL
14++Comment=
15++Changelog
16++2010-06-02
17++Initial version of patch
18 diff -Nur a/sql/log.cc b/sql/log.cc
19 --- a/sql/log.cc 2010-05-31 20:12:17.000000000 +0400
20 +++ b/sql/log.cc 2010-05-31 20:13:05.000000000 +0400
21@@ -67,7 +80,7 @@
22 - start.tm_year % 100, start.tm_mon + 1,
23 - start.tm_mday, start.tm_hour,
24 - start.tm_min, start.tm_sec);
25-+ if(opt_microseconds_in_slow_query_log)
26++ if(opt_slow_query_log_microseconds_timestamp)
27 + {
28 + ulonglong microsecond = current_utime % (1000 * 1000);
29 + buff_len= snprintf(buff, sizeof buff,
30@@ -134,7 +147,7 @@
31 my_bool opt_log_slow_sp_statements= 0;
32 my_bool opt_log_slow_timestamp_every= 0;
33 my_bool opt_use_global_long_query_time= 0;
34-+my_bool opt_microseconds_in_slow_query_log= 0;
35++my_bool opt_slow_query_log_microseconds_timestamp= 0;
36 my_bool lower_case_file_system= 0;
37 my_bool opt_large_pages= 0;
38 my_bool opt_myisam_use_mmap= 0;
39@@ -142,7 +155,7 @@
40 OPT_SUPPRESS_LOG_WARNING_1592,
41 OPT_USE_GLOBAL_LONG_QUERY_TIME,
42 OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
43-+ OPT_MICROSECONDS_IN_SLOW_QUERY_LOG,
44++ OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
45 OPT_IGNORE_BUILTIN_INNODB,
46 OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
47 OPT_DEFAULT_CHARACTER_SET_OLD
48@@ -150,9 +163,9 @@
49 "Control always use global long_query_time or local long_query_time.",
50 (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
51 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
52-+ {"microseconds_in_slow_query_log", OPT_MICROSECONDS_IN_SLOW_QUERY_LOG,
53++ {"slow_query_log_microseconds_timestamp", OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
54 + "Use microsecond time's precision in slow query log",
55-+ (uchar**) &opt_microseconds_in_slow_query_log, (uchar**) &opt_microseconds_in_slow_query_log,
56++ (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
57 + 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
58 {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
59 "If set to 1, table names are stored in lowercase on disk and table names "
60@@ -164,7 +177,7 @@
61 extern my_bool opt_log_slow_sp_statements;
62 extern my_bool opt_log_slow_timestamp_every;
63 extern my_bool opt_use_global_long_query_time;
64-+extern my_bool opt_microseconds_in_slow_query_log;
65++extern my_bool opt_slow_query_log_microseconds_timestamp;
66 extern my_bool sp_automatic_privileges, opt_noacl;
67 extern my_bool opt_old_style_user_limits, trust_function_creators;
68 extern uint opt_crash_binlog_innodb;
69@@ -175,8 +188,8 @@
70 &opt_log_slow_timestamp_every);
71 static sys_var_bool_ptr sys_use_global_long_query_time(&vars, "use_global_long_query_time",
72 &opt_use_global_long_query_time);
73-+static sys_var_bool_ptr sys_microseconds_in_slow_query_log(&vars, "microseconds_in_slow_query_log",
74-+ &opt_microseconds_in_slow_query_log);
75++static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
76++ &opt_slow_query_log_microseconds_timestamp);
77 /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
78 static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
79 &opt_slow_log, QUERY_LOG_SLOW);
80
81=== modified file 'mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result'
82--- mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result 2010-06-02 03:11:16 +0000
83+++ mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result 2010-06-02 18:12:26 +0000
84@@ -1,11 +1,11 @@
85 SELECT sleep(2);
86 sleep(2)
87 0
88-set global microseconds_in_slow_query_log=1;
89+set global slow_query_log_microseconds_timestamp=ON;
90 SELECT sleep(2);
91 sleep(2)
92 0
93-set global microseconds_in_slow_query_log=0;
94+set global slow_query_log_microseconds_timestamp=OFF;
95 cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l
96 1
97 cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+' | wc -l
98
99=== modified file 'mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test'
100--- mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test 2010-06-02 03:11:16 +0000
101+++ mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test 2010-06-02 18:12:26 +0000
102@@ -2,11 +2,11 @@
103
104 SELECT sleep(2);
105
106-set global microseconds_in_slow_query_log=1;
107+set global slow_query_log_microseconds_timestamp=ON;
108
109 SELECT sleep(2);
110
111-set global microseconds_in_slow_query_log=0;
112+set global slow_query_log_microseconds_timestamp=OFF;
113
114 let $cmd = cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l;
115 echo $cmd;

Subscribers

People subscribed via source and target branches

to all changes: