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
=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc 2013-09-09 06:59:26 +0000
+++ Percona-Server/sql/sql_parse.cc 2013-09-16 13:52:01 +0000
@@ -5820,7 +5820,9 @@
5820 double end_usecs= 0;5820 double end_usecs= 0;
5821 /* cpu time */5821 /* cpu time */
5822 int cputime_error= 0;5822 int cputime_error= 0;
5823#ifdef HAVE_CLOCK_GETTIME
5823 struct timespec tp;5824 struct timespec tp;
5825#endif
5824 double start_cpu_nsecs= 0;5826 double start_cpu_nsecs= 0;
5825 double end_cpu_nsecs= 0;5827 double end_cpu_nsecs= 0;
58265828
58275829
=== modified file 'Percona-Server/sql/sql_prepare.cc'
--- Percona-Server/sql/sql_prepare.cc 2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/sql_prepare.cc 2013-09-16 13:52:01 +0000
@@ -2192,7 +2192,9 @@
2192 double end_usecs= 0;2192 double end_usecs= 0;
2193 /* cpu time */2193 /* cpu time */
2194 int cputime_error= 0;2194 int cputime_error= 0;
2195#ifdef HAVE_CLOCK_GETTIME
2195 struct timespec tp;2196 struct timespec tp;
2197#endif
2196 double start_cpu_nsecs= 0;2198 double start_cpu_nsecs= 0;
2197 double end_cpu_nsecs= 0;2199 double end_cpu_nsecs= 0;
21982200
@@ -2647,7 +2649,9 @@
2647 double end_usecs= 0;2649 double end_usecs= 0;
2648 /* cpu time */2650 /* cpu time */
2649 int cputime_error= 0;2651 int cputime_error= 0;
2652#ifdef HAVE_CLOCK_GETTIME
2650 struct timespec tp;2653 struct timespec tp;
2654#endif
2651 double start_cpu_nsecs= 0;2655 double start_cpu_nsecs= 0;
2652 double end_cpu_nsecs= 0;2656 double end_cpu_nsecs= 0;
26532657
@@ -2823,7 +2827,9 @@
2823 double end_usecs= 0;2827 double end_usecs= 0;
2824 /* cpu time */2828 /* cpu time */
2825 int cputime_error= 0;2829 int cputime_error= 0;
2830#ifdef HAVE_CLOCK_GETTIME
2826 struct timespec tp;2831 struct timespec tp;
2832#endif
2827 double start_cpu_nsecs= 0;2833 double start_cpu_nsecs= 0;
2828 double end_cpu_nsecs= 0;2834 double end_cpu_nsecs= 0;
28292835
@@ -2959,7 +2965,9 @@
2959 double end_usecs= 0;2965 double end_usecs= 0;
2960 /* cpu time */2966 /* cpu time */
2961 int cputime_error= 0;2967 int cputime_error= 0;
2968#ifdef HAVE_CLOCK_GETTIME
2962 struct timespec tp;2969 struct timespec tp;
2970#endif
2963 double start_cpu_nsecs= 0;2971 double start_cpu_nsecs= 0;
2964 double end_cpu_nsecs= 0;2972 double end_cpu_nsecs= 0;
29652973
29662974
=== modified file 'Percona-Server/sql/sql_select.cc'
--- Percona-Server/sql/sql_select.cc 2013-08-14 03:52:04 +0000
+++ Percona-Server/sql/sql_select.cc 2013-09-16 13:52:01 +0000
@@ -273,7 +273,9 @@
273 ulong setup_tables_done_option)273 ulong setup_tables_done_option)
274{274{
275 bool res;275 bool res;
276#if defined(__linux__)
276 pid_t pid;277 pid_t pid;
278#endif
277 register SELECT_LEX *select_lex = &lex->select_lex;279 register SELECT_LEX *select_lex = &lex->select_lex;
278 DBUG_ENTER("handle_select");280 DBUG_ENTER("handle_select");
279#if defined(__linux__)281#if defined(__linux__)

Subscribers

People subscribed via source and target branches