Merge lp:~brianaker/libmemcached/fedora-fix into lp:libmemcached/1.0

Proposed by Brian Aker
Status: Work in progress
Proposed branch: lp:~brianaker/libmemcached/fedora-fix
Merge into: lp:libmemcached/1.0
Diff against target: 40 lines (+12/-3)
2 files modified
clients/memaslap.c (+9/-0)
clients/ms_memslap.h (+3/-3)
To merge this branch: bzr merge lp:~brianaker/libmemcached/fedora-fix
Reviewer Review Type Date Requested Status
Brian Aker Approve
Review via email: mp+402352@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) :
review: Approve

Unmerged revisions

1201. By Brian Aker on 2021-04-16

Patches from Fedora package system.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clients/memaslap.c'
2--- clients/memaslap.c 2013-02-23 10:17:33 +0000
3+++ clients/memaslap.c 2021-05-06 15:39:28 +0000
4@@ -32,6 +32,15 @@
5 #include "ms_setting.h"
6 #include "ms_thread.h"
7
8+/* global structure */
9+ms_global_t ms_global;
10+
11+/* global stats information structure */
12+ms_stats_t ms_stats;
13+
14+/* global statistic structure */
15+ms_statistic_t ms_statistic;
16+
17 #define PROGRAM_NAME "memslap"
18 #define PROGRAM_DESCRIPTION \
19 "Generates workload against memcached servers."
20
21=== modified file 'clients/ms_memslap.h'
22--- clients/ms_memslap.h 2011-04-28 00:28:00 +0000
23+++ clients/ms_memslap.h 2021-05-06 15:39:28 +0000
24@@ -117,13 +117,13 @@
25 } ms_global_t;
26
27 /* global structure */
28-ms_global_t ms_global;
29+extern ms_global_t ms_global;
30
31 /* global stats information structure */
32-ms_stats_t ms_stats;
33+extern ms_stats_t ms_stats;
34
35 /* global statistic structure */
36-ms_statistic_t ms_statistic;
37+extern ms_statistic_t ms_statistic;
38
39 #ifdef __cplusplus
40 }

Subscribers

People subscribed via source and target branches

to all changes: