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

Patches from Fedora package system.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'clients/memaslap.c'
--- clients/memaslap.c 2013-02-23 10:17:33 +0000
+++ clients/memaslap.c 2021-05-06 15:39:28 +0000
@@ -32,6 +32,15 @@
32#include "ms_setting.h"32#include "ms_setting.h"
33#include "ms_thread.h"33#include "ms_thread.h"
3434
35/* global structure */
36ms_global_t ms_global;
37
38/* global stats information structure */
39ms_stats_t ms_stats;
40
41/* global statistic structure */
42ms_statistic_t ms_statistic;
43
35#define PROGRAM_NAME "memslap"44#define PROGRAM_NAME "memslap"
36#define PROGRAM_DESCRIPTION \45#define PROGRAM_DESCRIPTION \
37 "Generates workload against memcached servers."46 "Generates workload against memcached servers."
3847
=== modified file 'clients/ms_memslap.h'
--- clients/ms_memslap.h 2011-04-28 00:28:00 +0000
+++ clients/ms_memslap.h 2021-05-06 15:39:28 +0000
@@ -117,13 +117,13 @@
117} ms_global_t;117} ms_global_t;
118118
119/* global structure */119/* global structure */
120ms_global_t ms_global;120extern ms_global_t ms_global;
121121
122/* global stats information structure */122/* global stats information structure */
123ms_stats_t ms_stats;123extern ms_stats_t ms_stats;
124124
125/* global statistic structure */125/* global statistic structure */
126ms_statistic_t ms_statistic;126extern ms_statistic_t ms_statistic;
127127
128#ifdef __cplusplus128#ifdef __cplusplus
129}129}

Subscribers

People subscribed via source and target branches

to all changes: