components/memcached/patches/02-memcached-items-c.patch
branchs11-update
changeset 2915 f3c0e109c208
parent 2914 4f1967424876
child 2916 df4f40cd040f
equal deleted inserted replaced
2914:4f1967424876 2915:f3c0e109c208
     1 This patch fixes the memcached bug
       
     2 https://code.google.com/p/memcached/issues/detail?id=306,
       
     3 which is not yet fixed upstream as of memcached v1.4.15.
       
     4 When we upgrade to an upstream version which fixes this problem,
       
     5 we can delete this patch.
       
     6 Part of the fix comes from the above bug location. 
       
     7 The full fix is here:
       
     8 http://debian.2.n7.nabble.com/attachment/2851013/0/memcached_1.4.13-0.2.debdiff
       
     9 
       
    10 --- memcached-1.4.5-orig/items.c	2010-04-03 00:07:16.000000000 -0700
       
    11 +++ memcached-1.4.5/items.c	2013-03-15 16:26:17.095818000 -0700
       
    12 @@ -468,9 +468,17 @@ item *do_item_get(const char *key, const
       
    13  
       
    14      if (settings.verbose > 2) {
       
    15          if (it == NULL) {
       
    16 -            fprintf(stderr, "> NOT FOUND %s", key);
       
    17 +            int ii;
       
    18 +            fprintf(stderr, "> NOT FOUND ");
       
    19 +            for (ii = 0; ii < nkey; ++ii) {
       
    20 +                fprintf(stderr, "%c", key[ii]);
       
    21 +            }
       
    22          } else {
       
    23 -            fprintf(stderr, "> FOUND KEY %s", ITEM_key(it));
       
    24 +            int ii;
       
    25 +            fprintf(stderr, "> FOUND KEY ");
       
    26 +            for (ii = 0; ii < it->nkey; ++ii) {
       
    27 +                fprintf(stderr, "%c", ITEM_key(it)[ii]);
       
    28 +            }
       
    29              was_found++;
       
    30          }
       
    31      }
       
    32 --- memcached-1.4.5-orig/memcached.c	2010-04-03 12:51:29.000000000 -0700
       
    33 +++ memcached-1.4.5/memcached.c	2013-01-15 17:30:53.964483000 -0800
       
    34 @@ -2001,7 +2001,12 @@ static void process_bin_delete(conn *c)
       
    35      assert(c != NULL);
       
    36  
       
    37      if (settings.verbose > 1) {
       
    38 -        fprintf(stderr, "Deleting %s\n", key);
       
    39 +        int ii;
       
    40 +        fprintf(stderr, "Deleting ");
       
    41 +        for (ii = 0; ii < nkey; ++ii) {
       
    42 +            fprintf(stderr, "%c", key[ii]);
       
    43 +        }
       
    44 +        fprintf(stderr, "\n");
       
    45      }
       
    46  
       
    47      if (settings.detail_enabled) {