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

Merge lp:~akopytov/percona-server/bug711817-5.5 into lp:percona-server/5.5

  1. bug711817-5.5
  2. Merge into 5.5
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 571
Proposed branch: lp:~akopytov/percona-server/bug711817-5.5
Merge into: lp:percona-server/5.5
Diff against target: 71 lines (+12/-0)
3 files modified
Percona-Server/sql/sql_parse.cc (+2/-0)
Percona-Server/sql/sql_prepare.cc (+8/-0)
Percona-Server/sql/sql_select.cc (+2/-0)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug711817-5.5
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+185808@code.launchpad.net

Description of the change

  Wrapped Linux-specific code into appropriate #ifdefs to avoid compiler
  warnings (or errors in case of -Werror) on non-Linux platforms.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Self-approving, trivial change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/sql_parse.cc'
2--- Percona-Server/sql/sql_parse.cc 2013-09-09 06:59:26 +0000
3+++ Percona-Server/sql/sql_parse.cc 2013-09-16 13:52:01 +0000
4@@ -5820,7 +5820,9 @@
5 double end_usecs= 0;
6 /* cpu time */
7 int cputime_error= 0;
8+#ifdef HAVE_CLOCK_GETTIME
9 struct timespec tp;
10+#endif
11 double start_cpu_nsecs= 0;
12 double end_cpu_nsecs= 0;
13
14
15=== modified file 'Percona-Server/sql/sql_prepare.cc'
16--- Percona-Server/sql/sql_prepare.cc 2013-06-27 15:35:20 +0000
17+++ Percona-Server/sql/sql_prepare.cc 2013-09-16 13:52:01 +0000
18@@ -2192,7 +2192,9 @@
19 double end_usecs= 0;
20 /* cpu time */
21 int cputime_error= 0;
22+#ifdef HAVE_CLOCK_GETTIME
23 struct timespec tp;
24+#endif
25 double start_cpu_nsecs= 0;
26 double end_cpu_nsecs= 0;
27
28@@ -2647,7 +2649,9 @@
29 double end_usecs= 0;
30 /* cpu time */
31 int cputime_error= 0;
32+#ifdef HAVE_CLOCK_GETTIME
33 struct timespec tp;
34+#endif
35 double start_cpu_nsecs= 0;
36 double end_cpu_nsecs= 0;
37
38@@ -2823,7 +2827,9 @@
39 double end_usecs= 0;
40 /* cpu time */
41 int cputime_error= 0;
42+#ifdef HAVE_CLOCK_GETTIME
43 struct timespec tp;
44+#endif
45 double start_cpu_nsecs= 0;
46 double end_cpu_nsecs= 0;
47
48@@ -2959,7 +2965,9 @@
49 double end_usecs= 0;
50 /* cpu time */
51 int cputime_error= 0;
52+#ifdef HAVE_CLOCK_GETTIME
53 struct timespec tp;
54+#endif
55 double start_cpu_nsecs= 0;
56 double end_cpu_nsecs= 0;
57
58
59=== modified file 'Percona-Server/sql/sql_select.cc'
60--- Percona-Server/sql/sql_select.cc 2013-08-14 03:52:04 +0000
61+++ Percona-Server/sql/sql_select.cc 2013-09-16 13:52:01 +0000
62@@ -273,7 +273,9 @@
63 ulong setup_tables_done_option)
64 {
65 bool res;
66+#if defined(__linux__)
67 pid_t pid;
68+#endif
69 register SELECT_LEX *select_lex = &lex->select_lex;
70 DBUG_ENTER("handle_select");
71 #if defined(__linux__)

Subscribers

People subscribed via source and target branches