RubyGems - memcached - Versions diffs - 0.10 → 0.11 - Mend

memcached 0.10 → 0.11

Files changed (22) hide show

data.tar.gz.sig +0 -0
data/CHANGELOG +4 -2
data/COMPATIBILITY +1 -0
data/Manifest +1 -1
data/README +4 -4
data/Rakefile +30 -0
data/TODO +3 -3
data/ext/rlibmemcached.i +20 -37
data/ext/rlibmemcached_wrap.c +815 -799
data/lib/memcached.rb +4 -0
data/lib/memcached/behaviors.rb +8 -7
data/lib/memcached/memcached.rb +53 -76
data/lib/memcached/rails.rb +1 -1
data/memcached.gemspec +103 -56
data/test/profile/benchmark.rb +1 -1
data/test/profile/profile.rb +1 -1
data/test/profile/valgrind.rb +1 -1
data/test/unit/memcached_test.rb +136 -121
data/test/unit/rails_test.rb +1 -1
metadata +17 -8
metadata.gz.sig +0 -0
data/test/profile/key.rb +0 -41

data.tar.gz.sig CHANGED

Binary file

data/CHANGELOG CHANGED

@@ -1,7 +1,9 @@
-v0.10. Move to libmemcached 0.20. Failover support. Close consistent hashing bugs.
+v0.11. Update to libmemcached 0.22. Support hostname lookups. Register %freefunc for MemcachedSt and remove destroy() method. Use new built-in behavior for namespacing. Raise on version mismatch. Remove private hash function. Fix bug related to socket size behavior reset when struct is initialized with missing servers (Jeffrey Hardy). WARNING! If you use a namespace, this version will effectively invalidate your entire cache.
-v0.9. Move to libmemcached 0.19. Add some failover tests, but we are still waiting on libmemcached's replication branch for them to actually be useful. Fix CAS bug (ktheory).
+v0.10. Update to libmemcached 0.20. Failover support. Close consistent hashing bugs.
+v0.9. Update to libmemcached 0.19. Add some failover tests, but we are still waiting on libmemcached's replication branch for them to actually be useful. Fix CAS bug (ktheory).
 v0.8.1. Disable NotFound backtraces for speed (Blaine Cook).

data/COMPATIBILITY CHANGED

@@ -4,6 +4,7 @@
 This chart shows which versions of the Ruby library are compatible with which versions of libmemcached.
 <b>Library version</b>:: <b>libmemcached version</b>
+0.11:: 0.22
 0.10:: 0.20
 0.9:: 0.19
 0.8:: 0.16

data/Manifest CHANGED

@@ -12,9 +12,9 @@ lib/memcached/rails.rb
 lib/memcached.rb
 LICENSE
 Manifest
+Rakefile
 README
 test/profile/benchmark.rb
-test/profile/key.rb
 test/profile/profile.rb
 test/profile/valgrind.rb
 test/setup.rb

data/README CHANGED

@@ -22,14 +22,14 @@ The <b>memcached</b> library wraps the pure-C libmemcached client via SWIG.
 == Installation
-You need Ruby 1.8.6, and {libmemcached 0.20}[http://tangent.org/552/libmemcached.html]. Other versions are not supported. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
+You need Ruby 1.8.6, and {libmemcached 0.21}[http://tangent.org/552/libmemcached.html]. Other versions are not supported. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
-For Linux, download and extract the {libmemcached tarball}[http://download.tangent.org/libmemcached-0.20.tar.gz]. Then run:
+For Linux, download and extract the {libmemcached tarball}[http://download.tangent.org/libmemcached-0.21.tar.gz]. Then run:
   ./configure
   make && sudo make install
 For OS X, you may be able to install it from MacPorts:
-  sudo port install libmemcached @0.20
+  sudo port install libmemcached @0.21
 Now install the gem:
   sudo gem install memcached --no-rdoc --no-ri
@@ -45,7 +45,7 @@ Start a local memcached server:
 Now, in Ruby, require the library and instantiate a Memcached object at a global level:
   require 'memcached'
-  $cache = Memcached.new("127.0.0.1:11211")
+  $cache = Memcached.new("localhost:11211")
 Now you can set things and get things:

data/Rakefile ADDED

@@ -0,0 +1,30 @@
+require 'echoe'
+Echoe.new("memcached") do |p|
+  p.author = "Evan Weaver"
+  p.project = "fauna"
+  p.summary = "An interface to the libmemcached C client."
+  p.url = "http://blog.evanweaver.com/files/doc/fauna/memcached/"
+  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+  p.rdoc_pattern = /README|TODO|LICENSE|CHANGELOG|BENCH|COMPAT|exceptions|behaviors|rails.rb|memcached.rb/
+end
+task :exceptions do
+  $LOAD_PATH << "lib"
+  require 'memcached'
+  Memcached.constants.sort.each do |const_name|
+    const = Memcached.send(:const_get, const_name)
+    next if const == Memcached::Success or const == Memcached::Stored
+    if const.is_a? Class and const < Memcached::Error
+      puts "* Memcached::#{const_name}"
+    end
+  end
+end
+task :valgrind do
+  exec("valgrind  --tool=memcheck --leak-check=yes --show-reachable=no --num-callers=15 --track-fds=yes ruby #{File.dirname(__FILE__)}/test/profile/valgrind.rb")
+end
+task :profile do
+ exec("ruby #{File.dirname(__FILE__)}/test/profile/profile.rb")
+end

data/TODO CHANGED

@@ -1,4 +1,4 @@
-* Test consistent hashing
-* Verify libmemcached version
-* Support hostname looks with caching behavior
+* Verify that DNS lookups are getting cached
+* Check for memory leaks in Valgrind after free callback change
+* Re-run benchmarks

data/ext/rlibmemcached.i CHANGED

@@ -11,6 +11,9 @@
 %include "typemaps.i"
+// Register libmemcached's struct free function to prevent memory leaks
+%freefunc memcached_st "memcached_free";
 //// Input maps
 %apply unsigned short { uint8_t };
@@ -26,7 +29,7 @@
   $2 = (size_t *) malloc(($3+1)*sizeof(size_t));
   $1 = (char **) malloc(($3+1)*sizeof(char *));
   for(i = 0; i < $3; i ++) {
-    $2[i] = strlen(StringValuePtr(RARRAY_PTR($input)[i]));
+    $2[i] = RSTRING(RARRAY_PTR($input)[i])->len;
     $1[i] = StringValuePtr(RARRAY_PTR($input)[i]);
   }
 }
@@ -36,20 +39,25 @@
 }
 // Generic strings
-%typemap(in) (char *str, size_t len) {
+%typemap(in) (const char *str, size_t len) {
  $1 = STR2CSTR($input);
  $2 = (size_t) RSTRING($input)->len;
 };
-%apply (char *str, size_t len) {
-  (char *namespace, size_t namespace_length),
-  (char *key, size_t key_length),
-  (char *value, size_t value_length)
+// Void type strings without lengths for prefix_key callback
+%typemap(in) (void *data) {
+ $1 = STR2CSTR($input);
+};
+%apply (const char *str, size_t len) {
+  (const char *namespace, size_t namespace_length),
+  (const char *key, size_t key_length),
+  (const char *value, size_t value_length)
 };
 // Key strings with same master key
-// XXX This will have to go once people start doing client-side replication and actually need to set the master key
-%typemap(in) (char *master_key, size_t master_key_length, char *key, size_t key_length) {
+// This will have to go if people actually want to set the master key separately
+%typemap(in) (const char *master_key, size_t master_key_length, const char *key, size_t key_length) {
  $3 = $1 = STR2CSTR($input);
  $4 = $2 = (size_t) RSTRING($input)->len;
 };
@@ -67,7 +75,7 @@
   $result = INT2FIX($1);
 };
-// String
+// String for memcached_fetch
 %typemap(in, numinputs=0) (char *key, size_t *key_length) {
   char string[256];
   size_t length = 0;
@@ -97,42 +105,20 @@
 %include "/opt/local/include/libmemcached/memcached.h"
 %include "/opt/local/include/libmemcached/memcached_constants.h"
+%include "/opt/local/include/libmemcached/memcached_get.h"
 %include "/opt/local/include/libmemcached/memcached_storage.h"
 %include "/opt/local/include/libmemcached/memcached_result.h"
 %include "/opt/local/include/libmemcached/memcached_server.h"
 //// Custom C functions
-// Namespace and validate key. We could avoid several more dispatches and allocations if we called this from the libmemcached wrappers directly.
-VALUE ns(char *namespace, size_t namespace_length, char *key, size_t key_length);
-%{
-VALUE ns(char *namespace, size_t namespace_length, char *key, size_t key_length) {
-  char namespaced_key[250];
-  size_t namespaced_key_length = namespace_length + key_length;
-  if (namespaced_key_length > 250)
-    namespaced_key_length = 250;
-  strncpy(namespaced_key, namespace, namespace_length);
-  strncpy(namespaced_key + namespace_length, key, namespaced_key_length - namespace_length);
-  int i;
-  for (i = 0; i < namespaced_key_length; i++)
-    if ((namespaced_key[i] < 33) || (namespaced_key[i] > 126))
-      // Outside printable range
-      namespaced_key[i] = '_';
-  return rb_str_new(namespaced_key, namespaced_key_length);
-};
-%}
 //// Manual wrappers
 // Single get. SWIG likes to use SWIG_FromCharPtr instead of SWIG_FromCharPtrAndSize because
 // of the retval/argout split, so it truncates return values with \0 in them.
-VALUE memcached_get_rvalue(memcached_st *ptr, char *key, size_t key_length, uint32_t *flags, memcached_return *error);
+VALUE memcached_get_rvalue(memcached_st *ptr, const char *key, size_t key_length, uint32_t *flags, memcached_return *error);
 %{
-VALUE memcached_get_rvalue(memcached_st *ptr, char *key, size_t key_length, uint32_t *flags, memcached_return *error) {
+VALUE memcached_get_rvalue(memcached_st *ptr, const char *key, size_t key_length, uint32_t *flags, memcached_return *error) {
   VALUE ret;
   size_t value_length;
   char *value = memcached_get(ptr, key, key_length, &value_length, flags, error);
@@ -190,6 +176,3 @@ memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat
   return &(stat_ptr[index]);
 };
 %}
-// Expose the hash generation function, which is not included in any header
-unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);

data/ext/rlibmemcached_wrap.c CHANGED

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.33
+ * Version 1.3.36
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -51,6 +51,12 @@
 # endif
 #endif
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -154,6 +160,12 @@
 # endif
 #endif
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -224,7 +236,7 @@
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -259,6 +271,7 @@
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -399,10 +412,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -529,8 +542,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 /*
@@ -840,12 +853,44 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifndef RSTRING_PTR
 # define RSTRING_PTR(x) RSTRING(x)->ptr
 #endif
+#ifndef RSTRING_END
+# define RSTRING_END(x) (RSTRING_PTR(x) + RSTRING_LEN(x))
+#endif
 #ifndef RARRAY_LEN
 # define RARRAY_LEN(x) RARRAY(x)->len
 #endif
 #ifndef RARRAY_PTR
 # define RARRAY_PTR(x) RARRAY(x)->ptr
 #endif
+#ifndef RFLOAT_VALUE
+# define RFLOAT_VALUE(x) RFLOAT(x)->value
+#endif
+#ifndef DOUBLE2NUM
+# define DOUBLE2NUM(x) rb_float_new(x)
+#endif
+#ifndef RHASH_TBL
+# define RHASH_TBL(x) (RHASH(x)->tbl)
+#endif
+#ifndef RHASH_ITER_LEV
+# define RHASH_ITER_LEV(x) (RHASH(x)->iter_lev)
+#endif
+#ifndef RHASH_IFNONE
+# define RHASH_IFNONE(x) (RHASH(x)->ifnone)
+#endif
+#ifndef RHASH_SIZE
+# define RHASH_SIZE(x) (RHASH(x)->tbl->num_entries)
+#endif
+#ifndef RHASH_EMPTY_P
+# define RHASH_EMPTY_P(x) (RHASH_SIZE(x) == 0)
+#endif
+#ifndef RSTRUCT_LEN
+# define RSTRUCT_LEN(x) RSTRUCT(x)->len
+#endif
+#ifndef RSTRUCT_PTR
+# define RSTRUCT_PTR(x) RSTRUCT(x)->ptr
+#endif
 /*
  * Need to be very careful about how these macros are defined, especially
@@ -1321,6 +1366,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)
 #define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)
+#include "assert.h"
 /* -----------------------------------------------------------------------------
  * pointers/data manipulation
@@ -1582,8 +1628,11 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) {
       return SWIG_ERROR;
+    } else {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     }
-    *ptr = SWIG_TypeCast(tc, vptr);
   } else {
     *ptr = vptr;
   }
@@ -1761,7 +1810,7 @@ static VALUE mRlibmemcached;
 #define SWIG_RUBY_THREAD_END_BLOCK
-#define SWIGVERSION 0x010333
+#define SWIGVERSION 0x010336
 #define SWIG_VERSION SWIGVERSION
@@ -1919,7 +1968,7 @@ SWIG_ruby_failed(void)
 }
-/*@SWIG:/opt/local/share/swig/1.3.33/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/opt/local/share/swig/1.3.36/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1964,7 +2013,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
-/*@SWIG:/opt/local/share/swig/1.3.33/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/opt/local/share/swig/1.3.36/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2023,9 +2072,6 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 SWIGINTERNINLINE int
 SWIG_AsVal_size_t (VALUE obj, size_t *val)
 {
@@ -2036,6 +2082,16 @@ SWIG_AsVal_size_t (VALUE obj, size_t *val)
 }
+SWIGINTERNINLINE VALUE
+SWIG_From_size_t  (size_t value)
+{
+  return SWIG_From_unsigned_SS_long  ((unsigned long)(value));
+}
 SWIGINTERNINLINE VALUE
 SWIG_From_long_SS_long  (long long value)
 {
@@ -2057,7 +2113,7 @@ SWIG_From_unsigned_SS_short  (unsigned short value)
 }
-/*@SWIG:/opt/local/share/swig/1.3.33/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/opt/local/share/swig/1.3.36/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2086,13 +2142,6 @@ SWIG_AsVal_unsigned_SS_long_SS_long (VALUE obj, unsigned long long *val)
 }
-SWIGINTERNINLINE VALUE
-SWIG_From_size_t  (size_t value)
-{
-  return SWIG_From_unsigned_SS_long  ((unsigned long)(value));
-}
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_short (VALUE obj, unsigned short *val)
 {
@@ -2109,27 +2158,7 @@ SWIG_AsVal_unsigned_SS_short (VALUE obj, unsigned short *val)
 }
-VALUE ns(char *namespace, size_t namespace_length, char *key, size_t key_length) {
-  char namespaced_key[250];
-  size_t namespaced_key_length = namespace_length + key_length;
-  if (namespaced_key_length > 250)
-    namespaced_key_length = 250;
-  strncpy(namespaced_key, namespace, namespace_length);
-  strncpy(namespaced_key + namespace_length, key, namespaced_key_length - namespace_length);
-  int i;
-  for (i = 0; i < namespaced_key_length; i++)
-    if ((namespaced_key[i] < 33) || (namespaced_key[i] > 126))
-      // Outside printable range
-      namespaced_key[i] = '_';
-  return rb_str_new(namespaced_key, namespaced_key_length);
-};
-VALUE memcached_get_rvalue(memcached_st *ptr, char *key, size_t key_length, uint32_t *flags, memcached_return *error) {
+VALUE memcached_get_rvalue(memcached_st *ptr, const char *key, size_t key_length, uint32_t *flags, memcached_return *error) {
   VALUE ret;
   size_t value_length;
   char *value = memcached_get(ptr, key, key_length, &value_length, flags, error);
@@ -2205,7 +2234,6 @@ _wrap_MemcachedContinuumItemSt_index_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->index = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2215,9 +2243,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedContinuumItemSt_index_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_continuum_item_st *arg1 = (struct memcached_continuum_item_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2265,7 +2293,6 @@ _wrap_MemcachedContinuumItemSt_value_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->value = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2275,9 +2302,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedContinuumItemSt_value_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_continuum_item_st *arg1 = (struct memcached_continuum_item_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2320,8 +2347,8 @@ _wrap_new_MemcachedContinuumItemSt(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (struct memcached_continuum_item_st *)(struct memcached_continuum_item_st *) calloc(1, sizeof(struct memcached_continuum_item_st));DATA_PTR(self) = result;
+  result = (struct memcached_continuum_item_st *)calloc(1, sizeof(struct memcached_continuum_item_st));
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -2364,7 +2391,6 @@ _wrap_MemcachedStatSt_pid_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->pid = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2374,9 +2400,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_pid_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2424,7 +2450,6 @@ _wrap_MemcachedStatSt_uptime_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->uptime = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2434,9 +2459,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_uptime_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2484,7 +2509,6 @@ _wrap_MemcachedStatSt_threads_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->threads = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2494,9 +2518,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_threads_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2544,7 +2568,6 @@ _wrap_MemcachedStatSt_time_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->time = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2554,9 +2577,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_time_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2604,7 +2627,6 @@ _wrap_MemcachedStatSt_pointer_size_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->pointer_size = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2614,9 +2636,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_pointer_size_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2664,7 +2686,6 @@ _wrap_MemcachedStatSt_rusage_user_seconds_set(int argc, VALUE *argv, VALUE self)
     }
   }
   if (arg1) (arg1)->rusage_user_seconds = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2674,9 +2695,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_rusage_user_seconds_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2724,7 +2745,6 @@ _wrap_MemcachedStatSt_rusage_user_microseconds_set(int argc, VALUE *argv, VALUE
     }
   }
   if (arg1) (arg1)->rusage_user_microseconds = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2734,9 +2754,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_rusage_user_microseconds_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2784,7 +2804,6 @@ _wrap_MemcachedStatSt_rusage_system_seconds_set(int argc, VALUE *argv, VALUE sel
     }
   }
   if (arg1) (arg1)->rusage_system_seconds = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2794,9 +2813,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_rusage_system_seconds_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2844,7 +2863,6 @@ _wrap_MemcachedStatSt_rusage_system_microseconds_set(int argc, VALUE *argv, VALU
     }
   }
   if (arg1) (arg1)->rusage_system_microseconds = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2854,9 +2872,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_rusage_system_microseconds_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2904,7 +2922,6 @@ _wrap_MemcachedStatSt_curr_items_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->curr_items = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2914,9 +2931,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_curr_items_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -2964,7 +2981,6 @@ _wrap_MemcachedStatSt_total_items_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->total_items = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -2974,9 +2990,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_total_items_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3024,7 +3040,6 @@ _wrap_MemcachedStatSt_limit_maxbytes_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->limit_maxbytes = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3034,9 +3049,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_limit_maxbytes_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3086,7 +3101,6 @@ _wrap_MemcachedStatSt_curr_connections_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->curr_connections = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3096,9 +3110,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_curr_connections_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3146,7 +3160,6 @@ _wrap_MemcachedStatSt_total_connections_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->total_connections = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3156,9 +3169,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_total_connections_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3206,7 +3219,6 @@ _wrap_MemcachedStatSt_connection_structures_set(int argc, VALUE *argv, VALUE sel
     }
   }
   if (arg1) (arg1)->connection_structures = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3216,9 +3228,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_connection_structures_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3266,7 +3278,6 @@ _wrap_MemcachedStatSt_bytes_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->bytes = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3276,9 +3287,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_bytes_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3328,7 +3339,6 @@ _wrap_MemcachedStatSt_cmd_get_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->cmd_get = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3338,9 +3348,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_cmd_get_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3390,7 +3400,6 @@ _wrap_MemcachedStatSt_cmd_set_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->cmd_set = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3400,9 +3409,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_cmd_set_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3452,7 +3461,6 @@ _wrap_MemcachedStatSt_get_hits_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->get_hits = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3462,9 +3470,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_get_hits_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3514,7 +3522,6 @@ _wrap_MemcachedStatSt_get_misses_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->get_misses = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3524,9 +3531,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_get_misses_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3576,7 +3583,6 @@ _wrap_MemcachedStatSt_evictions_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->evictions = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3586,9 +3592,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_evictions_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3638,7 +3644,6 @@ _wrap_MemcachedStatSt_bytes_read_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->bytes_read = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3648,9 +3653,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_bytes_read_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3700,7 +3705,6 @@ _wrap_MemcachedStatSt_bytes_written_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->bytes_written = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3710,9 +3714,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_bytes_written_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3766,9 +3770,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedStatSt_version_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_stat_st *arg1 = (struct memcached_stat_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3817,8 +3821,8 @@ _wrap_new_MemcachedStatSt(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (struct memcached_stat_st *)(struct memcached_stat_st *) calloc(1, sizeof(struct memcached_stat_st));DATA_PTR(self) = result;
+  result = (struct memcached_stat_st *)calloc(1, sizeof(struct memcached_stat_st));
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -3855,7 +3859,6 @@ _wrap_MemcachedSt_is_allocated_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_allocated)(val2);
   if (arg1) (arg1)->is_allocated = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3865,9 +3868,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_is_allocated_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_allocated result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_allocated result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3909,7 +3912,6 @@ _wrap_MemcachedSt_hosts_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_server_st *)(argp2);
   if (arg1) (arg1)->hosts = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3919,9 +3921,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_hosts_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_server_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_server_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -3963,7 +3965,6 @@ _wrap_MemcachedSt_number_of_hosts_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (unsigned int)(val2);
   if (arg1) (arg1)->number_of_hosts = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -3973,9 +3974,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_number_of_hosts_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4017,7 +4018,6 @@ _wrap_MemcachedSt_cursor_server_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (unsigned int)(val2);
   if (arg1) (arg1)->cursor_server = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4027,9 +4027,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_cursor_server_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4071,7 +4071,6 @@ _wrap_MemcachedSt_cached_errno_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (int)(val2);
   if (arg1) (arg1)->cached_errno = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4081,9 +4080,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_cached_errno_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4125,7 +4124,6 @@ _wrap_MemcachedSt_flags_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint32_t)(val2);
   if (arg1) (arg1)->flags = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4135,9 +4133,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_flags_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4179,7 +4177,6 @@ _wrap_MemcachedSt_send_size_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (int)(val2);
   if (arg1) (arg1)->send_size = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4189,9 +4186,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_send_size_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4233,7 +4230,6 @@ _wrap_MemcachedSt_recv_size_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (int)(val2);
   if (arg1) (arg1)->recv_size = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4243,9 +4239,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_recv_size_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4293,7 +4289,6 @@ _wrap_MemcachedSt_poll_timeout_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->poll_timeout = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4303,9 +4298,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_poll_timeout_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4353,7 +4348,6 @@ _wrap_MemcachedSt_connect_timeout_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->connect_timeout = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4363,9 +4357,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_connect_timeout_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4413,7 +4407,6 @@ _wrap_MemcachedSt_retry_timeout_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->retry_timeout = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4423,9 +4416,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_retry_timeout_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  int32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4473,7 +4466,6 @@ _wrap_MemcachedSt_result_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->result = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4483,9 +4475,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_result_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_result_st result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_result_st result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4545,7 +4537,6 @@ _wrap_MemcachedSt_hash_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_hash)(val2);
   if (arg1) (arg1)->hash = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4555,9 +4546,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_hash_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_hash result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_hash result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4599,7 +4590,6 @@ _wrap_MemcachedSt_distribution_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_server_distribution)(val2);
   if (arg1) (arg1)->distribution = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4609,9 +4599,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_distribution_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_server_distribution result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_server_distribution result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4651,7 +4641,6 @@ _wrap_MemcachedSt_user_data_set(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","user_data", 2, argv[0] ));
   }
   if (arg1) (arg1)->user_data = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4661,9 +4650,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_user_data_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4705,7 +4694,6 @@ _wrap_MemcachedSt_wheel_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (unsigned int *)(argp2);
   if (arg1) (arg1)->wheel = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4715,9 +4703,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_wheel_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  unsigned int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4765,7 +4753,6 @@ _wrap_MemcachedSt_wheel_count_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->wheel_count = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4775,9 +4762,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_wheel_count_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4825,7 +4812,6 @@ _wrap_MemcachedSt_continuum_count_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->continuum_count = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4835,9 +4821,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_continuum_count_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4879,7 +4865,6 @@ _wrap_MemcachedSt_continuum_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_continuum_item_st *)(argp2);
   if (arg1) (arg1)->continuum = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4889,9 +4874,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_continuum_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_continuum_item_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_continuum_item_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4939,7 +4924,6 @@ _wrap_MemcachedSt_on_clone_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->on_clone = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -4949,9 +4933,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_on_clone_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_clone_func result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_clone_func result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -4999,7 +4983,6 @@ _wrap_MemcachedSt_on_cleanup_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->on_cleanup = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5009,9 +4992,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_on_cleanup_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_cleanup_func result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_cleanup_func result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5059,7 +5042,6 @@ _wrap_MemcachedSt_call_free_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->call_free = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5069,9 +5051,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_call_free_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_free_function result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_free_function result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5119,7 +5101,6 @@ _wrap_MemcachedSt_call_malloc_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->call_malloc = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5129,9 +5110,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_call_malloc_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_malloc_function result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_malloc_function result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5179,7 +5160,6 @@ _wrap_MemcachedSt_call_realloc_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->call_realloc = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5189,9 +5169,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_call_realloc_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_realloc_function result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_realloc_function result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5239,7 +5219,6 @@ _wrap_MemcachedSt_get_key_failure_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->get_key_failure = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5249,9 +5228,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_get_key_failure_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_trigger_key result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_trigger_key result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5299,7 +5278,6 @@ _wrap_MemcachedSt_delete_trigger_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->delete_trigger = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -5309,9 +5287,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedSt_delete_trigger_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  memcached_trigger_delete_key result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_trigger_delete_key result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -5330,65 +5308,173 @@ fail:
 }
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-SWIGINTERN VALUE
-_wrap_MemcachedSt_allocate(VALUE self) {
-#else
-  SWIGINTERN VALUE
-  _wrap_MemcachedSt_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_memcached_st);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
-#endif
-    return vresult;
-  }
 SWIGINTERN VALUE
-_wrap_new_MemcachedSt(int argc, VALUE *argv, VALUE self) {
-  struct memcached_st *result = 0 ;
+_wrap_MemcachedSt_prefix_key_set(int argc, VALUE *argv, VALUE self) {
+  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
+  char *arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char temp2[MEMCACHED_PREFIX_KEY_MAX_SIZE] ;
+  int res2 ;
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  result = (struct memcached_st *)(struct memcached_st *) calloc(1, sizeof(struct memcached_st));DATA_PTR(self) = result;
-  return self;
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","prefix_key", 1, self ));
+  }
+  arg1 = (struct memcached_st *)(argp1);
+  res2 = SWIG_AsCharArray(argv[0], temp2, MEMCACHED_PREFIX_KEY_MAX_SIZE);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char [MEMCACHED_PREFIX_KEY_MAX_SIZE]","prefix_key", 2, argv[0] ));
+  }
+  arg2 = (char *)(temp2);
+  if (arg2) memcpy(arg1->prefix_key,arg2,MEMCACHED_PREFIX_KEY_MAX_SIZE*sizeof(char));
+  else memset(arg1->prefix_key,0,MEMCACHED_PREFIX_KEY_MAX_SIZE*sizeof(char));
+  return Qnil;
 fail:
   return Qnil;
 }
-SWIGINTERN void
-free_memcached_st(struct memcached_st *arg1) {
-    free((char *) arg1);
-}
 SWIGINTERN VALUE
-_wrap_memcached_lib_version(int argc, VALUE *argv, VALUE self) {
+_wrap_MemcachedSt_prefix_key_get(int argc, VALUE *argv, VALUE self) {
+  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (char *)memcached_lib_version();
-  vresult = SWIG_FromCharPtr((const char *)result);
-  return vresult;
-fail:
-  return Qnil;
-}
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","prefix_key", 1, self ));
+  }
+  arg1 = (struct memcached_st *)(argp1);
+  result = (char *)(char *) ((arg1)->prefix_key);
+  {
+    size_t size = MEMCACHED_PREFIX_KEY_MAX_SIZE;
+    while (size && (result[size - 1] == '\0')) --size;
+    vresult = SWIG_FromCharPtrAndSize(result, size);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_MemcachedSt_prefix_key_length_set(int argc, VALUE *argv, VALUE self) {
+  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
+  size_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","prefix_key_length", 1, self ));
+  }
+  arg1 = (struct memcached_st *)(argp1);
+  ecode2 = SWIG_AsVal_size_t(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","prefix_key_length", 2, argv[0] ));
+  }
+  arg2 = (size_t)(val2);
+  if (arg1) (arg1)->prefix_key_length = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_MemcachedSt_prefix_key_length_get(int argc, VALUE *argv, VALUE self) {
+  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t result;
+  VALUE vresult = Qnil;
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","prefix_key_length", 1, self ));
+  }
+  arg1 = (struct memcached_st *)(argp1);
+  result =  ((arg1)->prefix_key_length);
+  vresult = SWIG_From_size_t((size_t)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+SWIGINTERN VALUE
+_wrap_MemcachedSt_allocate(VALUE self) {
+#else
+  SWIGINTERN VALUE
+  _wrap_MemcachedSt_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_memcached_st);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+SWIGINTERN VALUE
+_wrap_new_MemcachedSt(int argc, VALUE *argv, VALUE self) {
+  struct memcached_st *result = 0 ;
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (struct memcached_st *)calloc(1, sizeof(struct memcached_st));
+  DATA_PTR(self) = result;
+  return self;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_memcached_lib_version(int argc, VALUE *argv, VALUE self) {
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (char *)memcached_lib_version();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
 SWIGINTERN VALUE
 _wrap_memcached_create(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 1) || (argc > 1)) {
@@ -5432,11 +5518,11 @@ SWIGINTERN VALUE
 _wrap_memcached_clone(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_st *arg2 = (memcached_st *) 0 ;
-  memcached_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  memcached_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5466,9 +5552,9 @@ _wrap_memcached_delete(int argc, VALUE *argv, VALUE self) {
   char *arg2 = (char *) 0 ;
   size_t arg3 ;
   time_t arg4 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -5489,7 +5575,7 @@ _wrap_memcached_delete(int argc, VALUE *argv, VALUE self) {
     else
     arg4 = NUM2LONG(rb_funcall(argv[2], rb_intern("tv_sec"), 0));
   }
-  result = (memcached_return)memcached_delete(arg1,arg2,arg3,arg4);
+  result = (memcached_return)memcached_delete(arg1,(char const *)arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5504,13 +5590,13 @@ _wrap_memcached_increment(int argc, VALUE *argv, VALUE self) {
   size_t arg3 ;
   uint32_t arg4 ;
   uint64_t *arg5 = (uint64_t *) 0 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val4 ;
   int ecode4 = 0 ;
   uint64_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  memcached_return result;
   VALUE vresult = Qnil;
   arg5 = &temp5;
@@ -5531,7 +5617,7 @@ _wrap_memcached_increment(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "uint32_t","memcached_increment", 4, argv[2] ));
   }
   arg4 = (uint32_t)(val4);
-  result = (memcached_return)memcached_increment(arg1,arg2,arg3,arg4,arg5);
+  result = (memcached_return)memcached_increment(arg1,(char const *)arg2,arg3,arg4,arg5);
   vresult = SWIG_From_int((int)(result));
   if (SWIG_IsTmpObj(res5)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_long_SS_long((*arg5)));
@@ -5552,13 +5638,13 @@ _wrap_memcached_decrement(int argc, VALUE *argv, VALUE self) {
   size_t arg3 ;
   uint32_t arg4 ;
   uint64_t *arg5 = (uint64_t *) 0 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val4 ;
   int ecode4 = 0 ;
   uint64_t temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  memcached_return result;
   VALUE vresult = Qnil;
   arg5 = &temp5;
@@ -5579,7 +5665,7 @@ _wrap_memcached_decrement(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "uint32_t","memcached_decrement", 4, argv[2] ));
   }
   arg4 = (uint32_t)(val4);
-  result = (memcached_return)memcached_decrement(arg1,arg2,arg3,arg4,arg5);
+  result = (memcached_return)memcached_decrement(arg1,(char const *)arg2,arg3,arg4,arg5);
   vresult = SWIG_From_int((int)(result));
   if (SWIG_IsTmpObj(res5)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_long_SS_long((*arg5)));
@@ -5627,7 +5713,6 @@ _wrap_memcached_stat(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   char *arg2 = (char *) 0 ;
   memcached_return *arg3 = (memcached_return *) 0 ;
-  memcached_stat_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -5635,6 +5720,7 @@ _wrap_memcached_stat(int argc, VALUE *argv, VALUE self) {
   int alloc2 = 0 ;
   memcached_return temp3 ;
   int res3 = SWIG_TMPOBJ ;
+  memcached_stat_st *result = 0 ;
   VALUE vresult = Qnil;
   arg3 = &temp3;
@@ -5673,7 +5759,6 @@ _wrap_memcached_stat_servername(int argc, VALUE *argv, VALUE self) {
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   unsigned int arg4 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -5684,6 +5769,7 @@ _wrap_memcached_stat_servername(int argc, VALUE *argv, VALUE self) {
   int alloc3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 4) || (argc > 4)) {
@@ -5725,9 +5811,9 @@ SWIGINTERN VALUE
 _wrap_memcached_flush(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   time_t arg2 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5756,11 +5842,11 @@ SWIGINTERN VALUE
 _wrap_memcached_verbosity(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   unsigned int arg2 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5809,11 +5895,11 @@ SWIGINTERN VALUE
 _wrap_memcached_strerror(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_return arg2 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5842,13 +5928,13 @@ _wrap_memcached_behavior_set(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_behavior arg2 ;
   uint64_t arg3 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   unsigned long long val3 ;
   int ecode3 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -5881,11 +5967,11 @@ SWIGINTERN VALUE
 _wrap_memcached_behavior_get(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_behavior arg2 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5912,74 +5998,58 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_get(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_server_add_udp(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  size_t *arg4 = (size_t *) 0 ;
-  uint32_t *arg5 = (uint32_t *) 0 ;
-  memcached_return *arg6 = (memcached_return *) 0 ;
-  char *result = 0 ;
+  unsigned int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  size_t temp4 ;
-  int res4 = SWIG_TMPOBJ ;
-  uint32_t temp5 ;
-  int res5 = SWIG_TMPOBJ ;
-  memcached_return temp6 ;
-  int res6 = SWIG_TMPOBJ ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
-  arg4 = &temp4;
-  arg5 = &temp5;
-  arg6 = &temp6;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_get", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_add_udp", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  {
-    arg2 = STR2CSTR(argv[1]);
-    arg3 = (size_t) RSTRING(argv[1])->len;
-  }
-  result = (char *)memcached_get(arg1,arg2,arg3,arg4,arg5,arg6);
-  vresult = SWIG_FromCharPtr((const char *)result);
-  if (SWIG_IsTmpObj(res4)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg4)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_size_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res5)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg5)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_uint32_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res6)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg6)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_memcached_return, new_flags));
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","memcached_server_add_udp", 2, argv[1] ));
   }
+  arg2 = (char *)(buf2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "unsigned int","memcached_server_add_udp", 3, argv[2] ));
+  }
+  arg3 = (unsigned int)(val3);
+  result = (memcached_return)memcached_server_add_udp(arg1,arg2,arg3);
+  vresult = SWIG_From_int((int)(result));
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
 fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return Qnil;
 }
 SWIGINTERN VALUE
-_wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_server_add_unix_socket(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  char **arg2 = (char **) 0 ;
-  size_t *arg3 = (size_t *) 0 ;
-  unsigned int arg4 ;
-  memcached_return result;
+  char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -5987,235 +6057,37 @@ _wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_mget", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_add_unix_socket", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  {
-    int i;
-    Check_Type(argv[1], T_ARRAY);
-    arg4 = (unsigned int) RARRAY_LEN(argv[1]);
-    arg3 = (size_t *) malloc((arg4+1)*sizeof(size_t));
-    arg2 = (char **) malloc((arg4+1)*sizeof(char *));
-    for(i = 0; i < arg4; i ++) {
-      arg3[i] = strlen(StringValuePtr(RARRAY_PTR(argv[1])[i]));
-      arg2[i] = StringValuePtr(RARRAY_PTR(argv[1])[i]);
-    }
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","memcached_server_add_unix_socket", 2, argv[1] ));
   }
-  result = (memcached_return)memcached_mget(arg1,arg2,arg3,arg4);
+  arg2 = (char *)(buf2);
+  result = (memcached_return)memcached_server_add_unix_socket(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
-  {
-    free(arg2);
-    free(arg3);
-  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
 fail:
-  {
-    free(arg2);
-    free(arg3);
-  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return Qnil;
 }
 SWIGINTERN VALUE
-_wrap_memcached_fetch(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_server_add(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   char *arg2 = (char *) 0 ;
-  size_t *arg3 = (size_t *) 0 ;
-  size_t *arg4 = (size_t *) 0 ;
-  uint32_t *arg5 = (uint32_t *) 0 ;
-  memcached_return *arg6 = (memcached_return *) 0 ;
-  char *result = 0 ;
+  unsigned int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  size_t temp4 ;
-  int res4 = SWIG_TMPOBJ ;
-  uint32_t temp5 ;
-  int res5 = SWIG_TMPOBJ ;
-  memcached_return temp6 ;
-  int res6 = SWIG_TMPOBJ ;
-  VALUE vresult = Qnil;
-  {
-    char string[256];
-    size_t length = 0;
-    arg2 = string;
-    arg3 = &length;
-  }
-  arg4 = &temp4;
-  arg5 = &temp5;
-  arg6 = &temp6;
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch", 1, argv[0] ));
-  }
-  arg1 = (memcached_st *)(argp1);
-  result = (char *)memcached_fetch(arg1,arg2,arg3,arg4,arg5,arg6);
-  vresult = SWIG_FromCharPtr((const char *)result);
-  {
-    // Pushes an empty string when *key_length == 0
-    rb_ary_push(vresult, rb_str_new(arg2, *arg3));
-  }
-  if (SWIG_IsTmpObj(res4)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg4)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_size_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res5)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg5)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_uint32_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res6)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg6)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_memcached_return, new_flags));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-SWIGINTERN VALUE
-_wrap_memcached_fetch_result(int argc, VALUE *argv, VALUE self) {
-  memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_result_st *arg2 = (memcached_result_st *) 0 ;
-  memcached_return *arg3 = (memcached_return *) 0 ;
-  memcached_result_st *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  memcached_return temp3 ;
-  int res3 = SWIG_TMPOBJ ;
-  VALUE vresult = Qnil;
-  arg3 = &temp3;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch_result", 1, argv[0] ));
-  }
-  arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_result_st, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_result_st *","memcached_fetch_result", 2, argv[1] ));
-  }
-  arg2 = (memcached_result_st *)(argp2);
-  result = (memcached_result_st *)memcached_fetch_result(arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_memcached_result_st, 0 |  0 );
-  if (SWIG_IsTmpObj(res3)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_memcached_return, new_flags));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-SWIGINTERN VALUE
-_wrap_memcached_server_add_udp(int argc, VALUE *argv, VALUE self) {
-  memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  unsigned int arg3 ;
-  memcached_return result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  unsigned int val3 ;
-  int ecode3 = 0 ;
-  VALUE vresult = Qnil;
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_add_udp", 1, argv[0] ));
-  }
-  arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","memcached_server_add_udp", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "unsigned int","memcached_server_add_udp", 3, argv[2] ));
-  }
-  arg3 = (unsigned int)(val3);
-  result = (memcached_return)memcached_server_add_udp(arg1,arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-SWIGINTERN VALUE
-_wrap_memcached_server_add_unix_socket(int argc, VALUE *argv, VALUE self) {
-  memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  memcached_return result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  VALUE vresult = Qnil;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_add_unix_socket", 1, argv[0] ));
-  }
-  arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","memcached_server_add_unix_socket", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (memcached_return)memcached_server_add_unix_socket(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-SWIGINTERN VALUE
-_wrap_memcached_server_add(int argc, VALUE *argv, VALUE self) {
-  memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  unsigned int arg3 ;
-  memcached_return result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  unsigned int val3 ;
-  int ecode3 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -6271,11 +6143,11 @@ SWIGINTERN VALUE
 _wrap_memcached_server_push(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_server_st *arg2 = (memcached_server_st *) 0 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -6305,7 +6177,6 @@ _wrap_memcached_server_list_append(int argc, VALUE *argv, VALUE self) {
   char *arg2 = (char *) 0 ;
   unsigned int arg3 ;
   memcached_return *arg4 = (memcached_return *) 0 ;
-  memcached_server_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -6315,6 +6186,7 @@ _wrap_memcached_server_list_append(int argc, VALUE *argv, VALUE self) {
   int ecode3 = 0 ;
   memcached_return temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  memcached_server_st *result = 0 ;
   VALUE vresult = Qnil;
   arg4 = &temp4;
@@ -6355,9 +6227,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_memcached_server_list_count(int argc, VALUE *argv, VALUE self) {
   memcached_server_st *arg1 = (memcached_server_st *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int result;
   VALUE vresult = Qnil;
   if ((argc < 1) || (argc > 1)) {
@@ -6379,10 +6251,10 @@ fail:
 SWIGINTERN VALUE
 _wrap_memcached_servers_parse(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
-  memcached_server_st *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
+  memcached_server_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 1) || (argc > 1)) {
@@ -6409,7 +6281,6 @@ _wrap_memcached_stat_get_value(int argc, VALUE *argv, VALUE self) {
   memcached_stat_st *arg2 = (memcached_stat_st *) 0 ;
   char *arg3 = (char *) 0 ;
   memcached_return *arg4 = (memcached_return *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6419,6 +6290,7 @@ _wrap_memcached_stat_get_value(int argc, VALUE *argv, VALUE self) {
   int alloc3 = 0 ;
   memcached_return temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   arg4 = &temp4;
@@ -6461,13 +6333,13 @@ _wrap_memcached_stat_get_keys(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_stat_st *arg2 = (memcached_stat_st *) 0 ;
   memcached_return *arg3 = (memcached_return *) 0 ;
-  char **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   memcached_return temp3 ;
   int res3 = SWIG_TMPOBJ ;
+  char **result = 0 ;
   VALUE vresult = Qnil;
   arg3 = &temp3;
@@ -6509,61 +6381,38 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_get_by_key(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_delete_by_key(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   char *arg2 = (char *) 0 ;
   size_t arg3 ;
   char *arg4 = (char *) 0 ;
   size_t arg5 ;
-  size_t *arg6 = (size_t *) 0 ;
-  uint32_t *arg7 = (uint32_t *) 0 ;
-  memcached_return *arg8 = (memcached_return *) 0 ;
-  char *result = 0 ;
+  time_t arg6 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  size_t temp6 ;
-  int res6 = SWIG_TMPOBJ ;
-  uint32_t temp7 ;
-  int res7 = SWIG_TMPOBJ ;
-  memcached_return temp8 ;
-  int res8 = SWIG_TMPOBJ ;
+  memcached_return result;
   VALUE vresult = Qnil;
-  arg6 = &temp6;
-  arg7 = &temp7;
-  arg8 = &temp8;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_get_by_key", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_delete_by_key", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
   {
     arg4 = arg2 = STR2CSTR(argv[1]);
     arg5 = arg3 = (size_t) RSTRING(argv[1])->len;
   }
-  result = (char *)memcached_get_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-  vresult = SWIG_FromCharPtr((const char *)result);
-  if (SWIG_IsTmpObj(res6)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg6)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_size_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res7)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg7)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res7) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_uint32_t, new_flags));
-  }
-  if (SWIG_IsTmpObj(res8)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg8)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res8) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg8), SWIGTYPE_p_memcached_return, new_flags));
+  {
+    if (NIL_P(argv[2]))
+    arg6 = (time_t)-1;
+    else
+    arg6 = NUM2LONG(rb_funcall(argv[2], rb_intern("tv_sec"), 0));
   }
+  result = (memcached_return)memcached_delete_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6);
+  vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -6571,81 +6420,61 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_mget_by_key(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_fetch_execute(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  char **arg4 = (char **) 0 ;
-  size_t *arg5 = (size_t *) 0 ;
-  unsigned int arg6 ;
-  memcached_return result;
+  memcached_execute_function *arg2 = (memcached_execute_function *) 0 ;
+  void *arg3 = (void *) 0 ;
+  unsigned int arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  VALUE vresult = Qnil;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  memcached_return result;
+  VALUE vresult = Qnil;
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_mget_by_key", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch_execute", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_execute_function, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","memcached_mget_by_key", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_execute_function *","memcached_fetch_execute", 2, argv[1] ));
   }
-  arg2 = (char *)(buf2);
-  ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","memcached_mget_by_key", 3, argv[2] ));
-  }
-  arg3 = (size_t)(val3);
-  {
-    int i;
-    Check_Type(argv[3], T_ARRAY);
-    arg6 = (unsigned int) RARRAY_LEN(argv[3]);
-    arg5 = (size_t *) malloc((arg6+1)*sizeof(size_t));
-    arg4 = (char **) malloc((arg6+1)*sizeof(char *));
-    for(i = 0; i < arg6; i ++) {
-      arg5[i] = strlen(StringValuePtr(RARRAY_PTR(argv[3])[i]));
-      arg4[i] = StringValuePtr(RARRAY_PTR(argv[3])[i]);
-    }
+  arg2 = (memcached_execute_function *)(argp2);
+  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","memcached_fetch_execute", 3, argv[2] ));
   }
-  result = (memcached_return)memcached_mget_by_key(arg1,arg2,arg3,arg4,arg5,arg6);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "unsigned int","memcached_fetch_execute", 4, argv[3] ));
+  }
+  arg4 = (unsigned int)(val4);
+  result = (memcached_return)memcached_fetch_execute(arg1,arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    free(arg4);
-    free(arg5);
-  }
   return vresult;
 fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    free(arg4);
-    free(arg5);
-  }
   return Qnil;
 }
 SWIGINTERN VALUE
-_wrap_memcached_delete_by_key(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_callback_set(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  size_t arg5 ;
-  time_t arg6 ;
-  memcached_return result;
+  memcached_callback arg2 ;
+  void *arg3 = (void *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -6653,20 +6482,18 @@ _wrap_memcached_delete_by_key(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_delete_by_key", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_callback_set", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "memcached_callback","memcached_callback_set", 2, argv[1] ));
+  }
+  arg2 = (memcached_callback)(val2);
   {
-    arg4 = arg2 = STR2CSTR(argv[1]);
-    arg5 = arg3 = (size_t) RSTRING(argv[1])->len;
-  }
-  {
-    if (NIL_P(argv[2]))
-    arg6 = (time_t)-1;
-    else
-    arg6 = NUM2LONG(rb_funcall(argv[2], rb_intern("tv_sec"), 0));
+    arg3 = STR2CSTR(argv[2]);
   }
-  result = (memcached_return)memcached_delete_by_key(arg1,arg2,arg3,arg4,arg5,arg6);
+  result = (memcached_return)memcached_callback_set(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6675,12 +6502,53 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_fetch_execute(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_callback_get(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_execute_function *arg2 = (memcached_execute_function *) 0 ;
+  memcached_callback arg2 ;
+  memcached_return *arg3 = (memcached_return *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  memcached_return temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  void *result = 0 ;
+  VALUE vresult = Qnil;
+  arg3 = &temp3;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_callback_get", 1, argv[0] ));
+  }
+  arg1 = (memcached_st *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "memcached_callback","memcached_callback_get", 2, argv[1] ));
+  }
+  arg2 = (memcached_callback)(val2);
+  result = (void *)memcached_callback_get(arg1,arg2,arg3);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  if (SWIG_IsTmpObj(res3)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_memcached_return, new_flags));
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_memcached_server_cursor(int argc, VALUE *argv, VALUE self) {
+  memcached_st *arg1 = (memcached_st *) 0 ;
+  memcached_server_function *arg2 = (memcached_server_function *) 0 ;
   void *arg3 = (void *) 0 ;
   unsigned int arg4 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6688,6 +6556,7 @@ _wrap_memcached_fetch_execute(int argc, VALUE *argv, VALUE self) {
   int res3 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 4) || (argc > 4)) {
@@ -6695,24 +6564,24 @@ _wrap_memcached_fetch_execute(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch_execute", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_cursor", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_execute_function, 0 |  0 );
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_server_function, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_execute_function *","memcached_fetch_execute", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_server_function *","memcached_server_cursor", 2, argv[1] ));
   }
-  arg2 = (memcached_execute_function *)(argp2);
+  arg2 = (memcached_server_function *)(argp2);
   res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","memcached_fetch_execute", 3, argv[2] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","memcached_server_cursor", 3, argv[2] ));
   }
   ecode4 = SWIG_AsVal_unsigned_SS_int(argv[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "unsigned int","memcached_fetch_execute", 4, argv[3] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "unsigned int","memcached_server_cursor", 4, argv[3] ));
   }
   arg4 = (unsigned int)(val4);
-  result = (memcached_return)memcached_fetch_execute(arg1,arg2,arg3,arg4);
+  result = (memcached_return)memcached_server_cursor(arg1,arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6721,78 +6590,297 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_callback_set(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_get(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_callback arg2 ;
-  void *arg3 = (void *) 0 ;
-  memcached_return result;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  size_t *arg4 = (size_t *) 0 ;
+  uint32_t *arg5 = (uint32_t *) 0 ;
+  memcached_return *arg6 = (memcached_return *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
+  size_t temp4 ;
+  int res4 = SWIG_TMPOBJ ;
+  uint32_t temp5 ;
+  int res5 = SWIG_TMPOBJ ;
+  memcached_return temp6 ;
+  int res6 = SWIG_TMPOBJ ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  arg4 = &temp4;
+  arg5 = &temp5;
+  arg6 = &temp6;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_callback_set", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_get", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "memcached_callback","memcached_callback_set", 2, argv[1] ));
-  }
-  arg2 = (memcached_callback)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","memcached_callback_set", 3, argv[2] ));
+  {
+    arg2 = STR2CSTR(argv[1]);
+    arg3 = (size_t) RSTRING(argv[1])->len;
   }
-  result = (memcached_return)memcached_callback_set(arg1,arg2,arg3);
+  result = (char *)memcached_get(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
+  vresult = SWIG_FromCharPtr((const char *)result);
+  if (SWIG_IsTmpObj(res4)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg4)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_size_t, new_flags));
+  }
+  if (SWIG_IsTmpObj(res5)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg5)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_uint32_t, new_flags));
+  }
+  if (SWIG_IsTmpObj(res6)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg6)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_memcached_return, new_flags));
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
+  memcached_st *arg1 = (memcached_st *) 0 ;
+  char **arg2 = (char **) 0 ;
+  size_t *arg3 = (size_t *) 0 ;
+  unsigned int arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  memcached_return result;
+  VALUE vresult = Qnil;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_mget", 1, argv[0] ));
+  }
+  arg1 = (memcached_st *)(argp1);
+  {
+    int i;
+    Check_Type(argv[1], T_ARRAY);
+    arg4 = (unsigned int) RARRAY_LEN(argv[1]);
+    arg3 = (size_t *) malloc((arg4+1)*sizeof(size_t));
+    arg2 = (char **) malloc((arg4+1)*sizeof(char *));
+    for(i = 0; i < arg4; i ++) {
+      arg3[i] = RSTRING(RARRAY_PTR(argv[1])[i])->len;
+      arg2[i] = StringValuePtr(RARRAY_PTR(argv[1])[i]);
+    }
+  }
+  result = (memcached_return)memcached_mget(arg1,arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
+  {
+    free(arg2);
+    free(arg3);
+  }
   return vresult;
 fail:
+  {
+    free(arg2);
+    free(arg3);
+  }
   return Qnil;
 }
 SWIGINTERN VALUE
-_wrap_memcached_callback_get(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_get_by_key(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_callback arg2 ;
-  memcached_return *arg3 = (memcached_return *) 0 ;
-  void *result = 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  size_t arg5 ;
+  size_t *arg6 = (size_t *) 0 ;
+  uint32_t *arg7 = (uint32_t *) 0 ;
+  memcached_return *arg8 = (memcached_return *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  memcached_return temp3 ;
-  int res3 = SWIG_TMPOBJ ;
+  size_t temp6 ;
+  int res6 = SWIG_TMPOBJ ;
+  uint32_t temp7 ;
+  int res7 = SWIG_TMPOBJ ;
+  memcached_return temp8 ;
+  int res8 = SWIG_TMPOBJ ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
-  arg3 = &temp3;
+  arg6 = &temp6;
+  arg7 = &temp7;
+  arg8 = &temp8;
   if ((argc < 2) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_callback_get", 1, argv[0] ));
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_get_by_key", 1, argv[0] ));
+  }
+  arg1 = (memcached_st *)(argp1);
+  {
+    arg4 = arg2 = STR2CSTR(argv[1]);
+    arg5 = arg3 = (size_t) RSTRING(argv[1])->len;
+  }
+  result = (char *)memcached_get_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
+  vresult = SWIG_FromCharPtr((const char *)result);
+  if (SWIG_IsTmpObj(res6)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg6)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_size_t, new_flags));
+  }
+  if (SWIG_IsTmpObj(res7)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg7)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res7) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_uint32_t, new_flags));
+  }
+  if (SWIG_IsTmpObj(res8)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg8)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res8) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg8), SWIGTYPE_p_memcached_return, new_flags));
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_memcached_mget_by_key(int argc, VALUE *argv, VALUE self) {
+  memcached_st *arg1 = (memcached_st *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  char **arg4 = (char **) 0 ;
+  size_t *arg5 = (size_t *) 0 ;
+  unsigned int arg6 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  memcached_return result;
+  VALUE vresult = Qnil;
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_mget_by_key", 1, argv[0] ));
+  }
+  arg1 = (memcached_st *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","memcached_mget_by_key", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","memcached_mget_by_key", 3, argv[2] ));
+  }
+  arg3 = (size_t)(val3);
+  {
+    int i;
+    Check_Type(argv[3], T_ARRAY);
+    arg6 = (unsigned int) RARRAY_LEN(argv[3]);
+    arg5 = (size_t *) malloc((arg6+1)*sizeof(size_t));
+    arg4 = (char **) malloc((arg6+1)*sizeof(char *));
+    for(i = 0; i < arg6; i ++) {
+      arg5[i] = RSTRING(RARRAY_PTR(argv[3])[i])->len;
+      arg4[i] = StringValuePtr(RARRAY_PTR(argv[3])[i]);
+    }
+  }
+  result = (memcached_return)memcached_mget_by_key(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
+  vresult = SWIG_From_int((int)(result));
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    free(arg4);
+    free(arg5);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    free(arg4);
+    free(arg5);
+  }
+  return Qnil;
+}
+SWIGINTERN VALUE
+_wrap_memcached_fetch(int argc, VALUE *argv, VALUE self) {
+  memcached_st *arg1 = (memcached_st *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t *arg3 = (size_t *) 0 ;
+  size_t *arg4 = (size_t *) 0 ;
+  uint32_t *arg5 = (uint32_t *) 0 ;
+  memcached_return *arg6 = (memcached_return *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t temp4 ;
+  int res4 = SWIG_TMPOBJ ;
+  uint32_t temp5 ;
+  int res5 = SWIG_TMPOBJ ;
+  memcached_return temp6 ;
+  int res6 = SWIG_TMPOBJ ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  {
+    char string[256];
+    size_t length = 0;
+    arg2 = string;
+    arg3 = &length;
+  }
+  arg4 = &temp4;
+  arg5 = &temp5;
+  arg6 = &temp6;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch", 1, argv[0] ));
+  }
+  arg1 = (memcached_st *)(argp1);
+  result = (char *)memcached_fetch(arg1,arg2,arg3,arg4,arg5,arg6);
+  vresult = SWIG_FromCharPtr((const char *)result);
+  {
+    // Pushes an empty string when *key_length == 0
+    rb_ary_push(vresult, rb_str_new(arg2, *arg3));
+  }
+  if (SWIG_IsTmpObj(res4)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_size_t((*arg4)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_size_t, new_flags));
+  }
+  if (SWIG_IsTmpObj(res5)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg5)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_uint32_t, new_flags));
   }
-  arg1 = (memcached_st *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "memcached_callback","memcached_callback_get", 2, argv[1] ));
-  }
-  arg2 = (memcached_callback)(val2);
-  result = (void *)memcached_callback_get(arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  if (SWIG_IsTmpObj(res3)) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg3)));
+  if (SWIG_IsTmpObj(res6)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg6)));
   } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_memcached_return, new_flags));
+    int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_memcached_return, new_flags));
   }
   return vresult;
 fail:
@@ -6801,45 +6889,41 @@ fail:
 SWIGINTERN VALUE
-_wrap_memcached_server_cursor(int argc, VALUE *argv, VALUE self) {
+_wrap_memcached_fetch_result(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
-  memcached_server_function *arg2 = (memcached_server_function *) 0 ;
-  void *arg3 = (void *) 0 ;
-  unsigned int arg4 ;
-  memcached_return result;
+  memcached_result_st *arg2 = (memcached_result_st *) 0 ;
+  memcached_return *arg3 = (memcached_return *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int res3 ;
-  unsigned int val4 ;
-  int ecode4 = 0 ;
+  memcached_return temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  memcached_result_st *result = 0 ;
   VALUE vresult = Qnil;
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  arg3 = &temp3;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_server_cursor", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_fetch_result", 1, argv[0] ));
   }
   arg1 = (memcached_st *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_server_function, 0 |  0 );
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_memcached_result_st, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_server_function *","memcached_server_cursor", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "memcached_result_st *","memcached_fetch_result", 2, argv[1] ));
   }
-  arg2 = (memcached_server_function *)(argp2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","memcached_server_cursor", 3, argv[2] ));
+  arg2 = (memcached_result_st *)(argp2);
+  result = (memcached_result_st *)memcached_fetch_result(arg1,arg2,arg3);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_memcached_result_st, 0 |  0 );
+  if (SWIG_IsTmpObj(res3)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_memcached_return, new_flags));
   }
-  ecode4 = SWIG_AsVal_unsigned_SS_int(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "unsigned int","memcached_server_cursor", 4, argv[3] ));
-  }
-  arg4 = (unsigned int)(val4);
-  result = (memcached_return)memcached_server_cursor(arg1,arg2,arg3,arg4);
-  vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -6855,11 +6939,11 @@ _wrap_memcached_set(int argc, VALUE *argv, VALUE self) {
   size_t arg5 ;
   time_t arg6 ;
   uint32_t arg7 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -6889,7 +6973,7 @@ _wrap_memcached_set(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_set", 7, argv[4] ));
   }
   arg7 = (uint32_t)(val7);
-  result = (memcached_return)memcached_set(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  result = (memcached_return)memcached_set(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6906,11 +6990,11 @@ _wrap_memcached_add(int argc, VALUE *argv, VALUE self) {
   size_t arg5 ;
   time_t arg6 ;
   uint32_t arg7 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -6940,7 +7024,7 @@ _wrap_memcached_add(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_add", 7, argv[4] ));
   }
   arg7 = (uint32_t)(val7);
-  result = (memcached_return)memcached_add(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  result = (memcached_return)memcached_add(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6957,11 +7041,11 @@ _wrap_memcached_replace(int argc, VALUE *argv, VALUE self) {
   size_t arg5 ;
   time_t arg6 ;
   uint32_t arg7 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -6991,7 +7075,7 @@ _wrap_memcached_replace(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_replace", 7, argv[4] ));
   }
   arg7 = (uint32_t)(val7);
-  result = (memcached_return)memcached_replace(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  result = (memcached_return)memcached_replace(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7008,11 +7092,11 @@ _wrap_memcached_append(int argc, VALUE *argv, VALUE self) {
   size_t arg5 ;
   time_t arg6 ;
   uint32_t arg7 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7042,7 +7126,7 @@ _wrap_memcached_append(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_append", 7, argv[4] ));
   }
   arg7 = (uint32_t)(val7);
-  result = (memcached_return)memcached_append(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  result = (memcached_return)memcached_append(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7059,11 +7143,11 @@ _wrap_memcached_prepend(int argc, VALUE *argv, VALUE self) {
   size_t arg5 ;
   time_t arg6 ;
   uint32_t arg7 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7093,7 +7177,7 @@ _wrap_memcached_prepend(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_prepend", 7, argv[4] ));
   }
   arg7 = (uint32_t)(val7);
-  result = (memcached_return)memcached_prepend(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  result = (memcached_return)memcached_prepend(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7111,13 +7195,13 @@ _wrap_memcached_cas(int argc, VALUE *argv, VALUE self) {
   time_t arg6 ;
   uint32_t arg7 ;
   uint64_t arg8 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val7 ;
   int ecode7 = 0 ;
   unsigned long long val8 ;
   int ecode8 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 6) || (argc > 6)) {
@@ -7152,7 +7236,7 @@ _wrap_memcached_cas(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "uint64_t","memcached_cas", 8, argv[5] ));
   }
   arg8 = (uint64_t)(val8);
-  result = (memcached_return)memcached_cas(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+  result = (memcached_return)memcached_cas(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7171,11 +7255,11 @@ _wrap_memcached_set_by_key(int argc, VALUE *argv, VALUE self) {
   size_t arg7 ;
   time_t arg8 ;
   uint32_t arg9 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7205,7 +7289,7 @@ _wrap_memcached_set_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_set_by_key", 9, argv[4] ));
   }
   arg9 = (uint32_t)(val9);
-  result = (memcached_return)memcached_set_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  result = (memcached_return)memcached_set_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7224,11 +7308,11 @@ _wrap_memcached_add_by_key(int argc, VALUE *argv, VALUE self) {
   size_t arg7 ;
   time_t arg8 ;
   uint32_t arg9 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7258,7 +7342,7 @@ _wrap_memcached_add_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_add_by_key", 9, argv[4] ));
   }
   arg9 = (uint32_t)(val9);
-  result = (memcached_return)memcached_add_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  result = (memcached_return)memcached_add_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7277,11 +7361,11 @@ _wrap_memcached_replace_by_key(int argc, VALUE *argv, VALUE self) {
   size_t arg7 ;
   time_t arg8 ;
   uint32_t arg9 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7311,7 +7395,7 @@ _wrap_memcached_replace_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_replace_by_key", 9, argv[4] ));
   }
   arg9 = (uint32_t)(val9);
-  result = (memcached_return)memcached_replace_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  result = (memcached_return)memcached_replace_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7330,11 +7414,11 @@ _wrap_memcached_prepend_by_key(int argc, VALUE *argv, VALUE self) {
   size_t arg7 ;
   time_t arg8 ;
   uint32_t arg9 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7364,7 +7448,7 @@ _wrap_memcached_prepend_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_prepend_by_key", 9, argv[4] ));
   }
   arg9 = (uint32_t)(val9);
-  result = (memcached_return)memcached_prepend_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  result = (memcached_return)memcached_prepend_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7383,11 +7467,11 @@ _wrap_memcached_append_by_key(int argc, VALUE *argv, VALUE self) {
   size_t arg7 ;
   time_t arg8 ;
   uint32_t arg9 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 5) || (argc > 5)) {
@@ -7417,7 +7501,7 @@ _wrap_memcached_append_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_append_by_key", 9, argv[4] ));
   }
   arg9 = (uint32_t)(val9);
-  result = (memcached_return)memcached_append_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  result = (memcached_return)memcached_append_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7437,13 +7521,13 @@ _wrap_memcached_cas_by_key(int argc, VALUE *argv, VALUE self) {
   time_t arg8 ;
   uint32_t arg9 ;
   uint64_t arg10 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val9 ;
   int ecode9 = 0 ;
   unsigned long long val10 ;
   int ecode10 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 6) || (argc > 6)) {
@@ -7478,7 +7562,7 @@ _wrap_memcached_cas_by_key(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "uint64_t","memcached_cas_by_key", 10, argv[5] ));
   }
   arg10 = (uint64_t)(val10);
-  result = (memcached_return)memcached_cas_by_key(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+  result = (memcached_return)memcached_cas_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7,arg8,arg9,arg10);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -7511,7 +7595,6 @@ _wrap_MemcachedResultSt_is_allocated_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_allocated)(val2);
   if (arg1) (arg1)->is_allocated = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7521,9 +7604,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_is_allocated_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  memcached_allocated result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_allocated result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7565,7 +7648,6 @@ _wrap_MemcachedResultSt_root_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_st *)(argp2);
   if (arg1) (arg1)->root = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7575,9 +7657,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_root_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  memcached_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7629,9 +7711,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_key_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7679,7 +7761,6 @@ _wrap_MemcachedResultSt_key_length_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (size_t)(val2);
   if (arg1) (arg1)->key_length = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7689,9 +7770,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_key_length_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7739,7 +7820,6 @@ _wrap_MemcachedResultSt_value_set(int argc, VALUE *argv, VALUE self) {
     }
   }
   if (arg1) (arg1)->value = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7749,9 +7829,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_value_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  memcached_string_st result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_string_st result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7793,7 +7873,6 @@ _wrap_MemcachedResultSt_flags_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint32_t)(val2);
   if (arg1) (arg1)->flags = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7803,9 +7882,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_flags_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  uint32_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7847,7 +7926,6 @@ _wrap_MemcachedResultSt_cas_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint64_t)(val2);
   if (arg1) (arg1)->cas = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7857,9 +7935,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_cas_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  uint64_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint64_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7900,7 +7978,6 @@ _wrap_MemcachedResultSt_expiration_set(int argc, VALUE *argv, VALUE self) {
     arg2 = NUM2LONG(rb_funcall(argv[0], rb_intern("tv_sec"), 0));
   }
   if (arg1) (arg1)->expiration = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -7910,9 +7987,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedResultSt_expiration_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_result_st *arg1 = (struct memcached_result_st *) 0 ;
-  time_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  time_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -7957,8 +8034,8 @@ _wrap_new_MemcachedResultSt(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (struct memcached_result_st *)(struct memcached_result_st *) calloc(1, sizeof(struct memcached_result_st));DATA_PTR(self) = result;
+  result = (struct memcached_result_st *)calloc(1, sizeof(struct memcached_result_st));
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -8016,11 +8093,11 @@ SWIGINTERN VALUE
 _wrap_memcached_result_create(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_result_st *arg2 = (memcached_result_st *) 0 ;
-  memcached_result_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  memcached_result_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -8047,9 +8124,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_memcached_result_value(int argc, VALUE *argv, VALUE self) {
   memcached_result_st *arg1 = (memcached_result_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 1) || (argc > 1)) {
@@ -8071,9 +8148,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_memcached_result_length(int argc, VALUE *argv, VALUE self) {
   memcached_result_st *arg1 = (memcached_result_st *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   if ((argc < 1) || (argc > 1)) {
@@ -8097,7 +8174,6 @@ _wrap_memcached_result_set_value(int argc, VALUE *argv, VALUE self) {
   memcached_result_st *arg1 = (memcached_result_st *) 0 ;
   char *arg2 = (char *) 0 ;
   size_t arg3 ;
-  memcached_return result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -8105,6 +8181,7 @@ _wrap_memcached_result_set_value(int argc, VALUE *argv, VALUE self) {
   int alloc2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
+  memcached_return result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -8170,9 +8247,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_hostname_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8220,7 +8297,6 @@ _wrap_MemcachedServerSt_port_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (unsigned int)(val2);
   if (arg1) (arg1)->port = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8230,9 +8306,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_port_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8274,7 +8350,6 @@ _wrap_MemcachedServerSt_fd_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (int)(val2);
   if (arg1) (arg1)->fd = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8284,9 +8359,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_fd_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8328,7 +8403,6 @@ _wrap_MemcachedServerSt_cached_errno_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (int)(val2);
   if (arg1) (arg1)->cached_errno = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8338,9 +8412,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_cached_errno_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8382,7 +8456,6 @@ _wrap_MemcachedServerSt_cursor_active_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (unsigned int)(val2);
   if (arg1) (arg1)->cursor_active = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8392,9 +8465,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_cursor_active_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  unsigned int result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8446,9 +8519,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_write_buffer_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8496,7 +8569,6 @@ _wrap_MemcachedServerSt_write_buffer_offset_set(int argc, VALUE *argv, VALUE sel
   }
   arg2 = (size_t)(val2);
   if (arg1) (arg1)->write_buffer_offset = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8506,9 +8578,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_write_buffer_offset_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8560,9 +8632,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_read_buffer_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8610,7 +8682,6 @@ _wrap_MemcachedServerSt_read_data_length_set(int argc, VALUE *argv, VALUE self)
   }
   arg2 = (size_t)(val2);
   if (arg1) (arg1)->read_data_length = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8620,9 +8691,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_read_data_length_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8664,7 +8735,6 @@ _wrap_MemcachedServerSt_read_buffer_length_set(int argc, VALUE *argv, VALUE self
   }
   arg2 = (size_t)(val2);
   if (arg1) (arg1)->read_buffer_length = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8674,9 +8744,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_read_buffer_length_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8736,9 +8806,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_read_ptr_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8780,7 +8850,6 @@ _wrap_MemcachedServerSt_sockaddr_inited_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_allocated)(val2);
   if (arg1) (arg1)->sockaddr_inited = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8790,9 +8859,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_sockaddr_inited_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  memcached_allocated result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_allocated result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8834,7 +8903,6 @@ _wrap_MemcachedServerSt_address_info_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (struct addrinfo *)(argp2);
   if (arg1) (arg1)->address_info = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8844,9 +8912,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_address_info_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  struct addrinfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  struct addrinfo *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8888,7 +8956,6 @@ _wrap_MemcachedServerSt_type_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_connection)(val2);
   if (arg1) (arg1)->type = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8898,9 +8965,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_type_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  memcached_connection result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_connection result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8942,7 +9009,6 @@ _wrap_MemcachedServerSt_major_version_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint8_t)(val2);
   if (arg1) (arg1)->major_version = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -8952,9 +9018,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_major_version_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  uint8_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint8_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -8996,7 +9062,6 @@ _wrap_MemcachedServerSt_minor_version_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint8_t)(val2);
   if (arg1) (arg1)->minor_version = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -9006,9 +9071,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_minor_version_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  uint8_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint8_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -9050,7 +9115,6 @@ _wrap_MemcachedServerSt_micro_version_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint8_t)(val2);
   if (arg1) (arg1)->micro_version = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -9060,9 +9124,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_micro_version_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  uint8_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint8_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -9104,7 +9168,6 @@ _wrap_MemcachedServerSt_count_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (uint16_t)(val2);
   if (arg1) (arg1)->count = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -9114,9 +9177,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_count_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  uint16_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint16_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -9157,7 +9220,6 @@ _wrap_MemcachedServerSt_next_retry_set(int argc, VALUE *argv, VALUE self) {
     arg2 = NUM2LONG(rb_funcall(argv[0], rb_intern("tv_sec"), 0));
   }
   if (arg1) (arg1)->next_retry = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -9167,9 +9229,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_next_retry_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  time_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  time_t result;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -9213,7 +9275,6 @@ _wrap_MemcachedServerSt_root_set(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (memcached_st *)(argp2);
   if (arg1) (arg1)->root = arg2;
   return Qnil;
 fail:
   return Qnil;
@@ -9223,9 +9284,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_MemcachedServerSt_root_get(int argc, VALUE *argv, VALUE self) {
   struct memcached_server_st *arg1 = (struct memcached_server_st *) 0 ;
-  memcached_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  memcached_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 0) || (argc > 0)) {
@@ -9268,8 +9329,8 @@ _wrap_new_MemcachedServerSt(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (struct memcached_server_st *)(struct memcached_server_st *) calloc(1, sizeof(struct memcached_server_st));DATA_PTR(self) = result;
+  result = (struct memcached_server_st *)calloc(1, sizeof(struct memcached_server_st));
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -9281,34 +9342,6 @@ free_memcached_server_st(struct memcached_server_st *arg1) {
     free((char *) arg1);
 }
-SWIGINTERN VALUE
-_wrap_ns(int argc, VALUE *argv, VALUE self) {
-  char *arg1 = (char *) 0 ;
-  size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  size_t arg4 ;
-  VALUE result;
-  VALUE vresult = Qnil;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  {
-    arg1 = STR2CSTR(argv[0]);
-    arg2 = (size_t) RSTRING(argv[0])->len;
-  }
-  {
-    arg3 = STR2CSTR(argv[1]);
-    arg4 = (size_t) RSTRING(argv[1])->len;
-  }
-  result = (VALUE)ns(arg1,arg2,arg3,arg4);
-  vresult = result;
-  return vresult;
-fail:
-  return Qnil;
-}
 SWIGINTERN VALUE
 _wrap_memcached_get_rvalue(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
@@ -9316,13 +9349,13 @@ _wrap_memcached_get_rvalue(int argc, VALUE *argv, VALUE self) {
   size_t arg3 ;
   uint32_t *arg4 = (uint32_t *) 0 ;
   memcached_return *arg5 = (memcached_return *) 0 ;
-  VALUE result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   uint32_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   memcached_return temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  VALUE result;
   VALUE vresult = Qnil;
   arg4 = &temp4;
@@ -9339,7 +9372,7 @@ _wrap_memcached_get_rvalue(int argc, VALUE *argv, VALUE self) {
     arg2 = STR2CSTR(argv[1]);
     arg3 = (size_t) RSTRING(argv[1])->len;
   }
-  result = (VALUE)memcached_get_rvalue(arg1,arg2,arg3,arg4,arg5);
+  result = (VALUE)memcached_get_rvalue(arg1,(char const *)arg2,arg3,arg4,arg5);
   vresult = result;
   if (SWIG_IsTmpObj(res4)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_int((*arg4)));
@@ -9366,13 +9399,13 @@ _wrap_memcached_fetch_rvalue(int argc, VALUE *argv, VALUE self) {
   size_t *arg3 = (size_t *) 0 ;
   uint32_t *arg4 = (uint32_t *) 0 ;
   memcached_return *arg5 = (memcached_return *) 0 ;
-  VALUE result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   uint32_t temp4 ;
   int res4 = SWIG_TMPOBJ ;
   memcached_return temp5 ;
   int res5 = SWIG_TMPOBJ ;
+  VALUE result;
   VALUE vresult = Qnil;
   {
@@ -9421,7 +9454,6 @@ _wrap_memcached_stat_get_rvalue(int argc, VALUE *argv, VALUE self) {
   memcached_stat_st *arg2 = (memcached_stat_st *) 0 ;
   char *arg3 = (char *) 0 ;
   memcached_return *arg4 = (memcached_return *) 0 ;
-  VALUE result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9431,6 +9463,7 @@ _wrap_memcached_stat_get_rvalue(int argc, VALUE *argv, VALUE self) {
   int alloc3 = 0 ;
   memcached_return temp4 ;
   int res4 = SWIG_TMPOBJ ;
+  VALUE result;
   VALUE vresult = Qnil;
   arg4 = &temp4;
@@ -9472,11 +9505,11 @@ SWIGINTERN VALUE
 _wrap_memcached_select_server_at(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   int arg2 ;
-  memcached_server_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  memcached_server_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 2) || (argc > 2)) {
@@ -9505,13 +9538,13 @@ _wrap_memcached_select_stat_at(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
   memcached_stat_st *arg2 = (memcached_stat_st *) 0 ;
   int arg3 ;
-  memcached_stat_st *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
+  memcached_stat_st *result = 0 ;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
@@ -9540,36 +9573,6 @@ fail:
 }
-SWIGINTERN VALUE
-_wrap_memcached_generate_hash(int argc, VALUE *argv, VALUE self) {
-  memcached_st *arg1 = (memcached_st *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  unsigned int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  VALUE vresult = Qnil;
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_generate_hash", 1, argv[0] ));
-  }
-  arg1 = (memcached_st *)(argp1);
-  {
-    arg2 = STR2CSTR(argv[1]);
-    arg3 = (size_t) RSTRING(argv[1])->len;
-  }
-  result = (unsigned int)memcached_generate_hash(arg1,arg2,arg3);
-  vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
@@ -9769,7 +9772,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   clientdata = clientdata;
@@ -9779,6 +9782,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   /* Try and load any already created modules */
@@ -9807,6 +9813,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
+  /* When multiple interpeters are used, a module could have already been initialized in
+     a different interpreter, but not yet have a pointer in this interpreter.
+     In this case, we do not want to continue adding types... everything should be
+     set up already */
+  if (init == 0) return;
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -9971,7 +9983,7 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   cMemcachedContinuumItemSt.mark = 0;
   cMemcachedContinuumItemSt.destroy = (void (*)(void *)) free_memcached_continuum_item_st;
   cMemcachedContinuumItemSt.trackObjects = 0;
-  rb_define_const(mRlibmemcached, "LIBMEMCACHED_VERSION_STRING", SWIG_FromCharPtr("0.20"));
+  rb_define_const(mRlibmemcached, "LIBMEMCACHED_VERSION_STRING", SWIG_FromCharPtr("0.22"));
   cMemcachedStatSt.klass = rb_define_class_under(mRlibmemcached, "MemcachedStatSt", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_memcached_stat_st, (void *) &cMemcachedStatSt);
@@ -10085,8 +10097,12 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_method(cMemcachedSt.klass, "get_key_failure", _wrap_MemcachedSt_get_key_failure_get, -1);
   rb_define_method(cMemcachedSt.klass, "delete_trigger=", _wrap_MemcachedSt_delete_trigger_set, -1);
   rb_define_method(cMemcachedSt.klass, "delete_trigger", _wrap_MemcachedSt_delete_trigger_get, -1);
+  rb_define_method(cMemcachedSt.klass, "prefix_key=", _wrap_MemcachedSt_prefix_key_set, -1);
+  rb_define_method(cMemcachedSt.klass, "prefix_key", _wrap_MemcachedSt_prefix_key_get, -1);
+  rb_define_method(cMemcachedSt.klass, "prefix_key_length=", _wrap_MemcachedSt_prefix_key_length_set, -1);
+  rb_define_method(cMemcachedSt.klass, "prefix_key_length", _wrap_MemcachedSt_prefix_key_length_get, -1);
   cMemcachedSt.mark = 0;
-  cMemcachedSt.destroy = (void (*)(void *)) free_memcached_st;
+  cMemcachedSt.destroy = (void (*)(void *)) memcached_free;
   cMemcachedSt.trackObjects = 0;
   rb_define_module_function(mRlibmemcached, "memcached_lib_version", _wrap_memcached_lib_version, -1);
   rb_define_module_function(mRlibmemcached, "memcached_create", _wrap_memcached_create, -1);
@@ -10104,10 +10120,6 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_module_function(mRlibmemcached, "memcached_strerror", _wrap_memcached_strerror, -1);
   rb_define_module_function(mRlibmemcached, "memcached_behavior_set", _wrap_memcached_behavior_set, -1);
   rb_define_module_function(mRlibmemcached, "memcached_behavior_get", _wrap_memcached_behavior_get, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_get", _wrap_memcached_get, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_mget", _wrap_memcached_mget, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_fetch", _wrap_memcached_fetch, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_fetch_result", _wrap_memcached_fetch_result, -1);
   rb_define_module_function(mRlibmemcached, "memcached_server_add_udp", _wrap_memcached_server_add_udp, -1);
   rb_define_module_function(mRlibmemcached, "memcached_server_add_unix_socket", _wrap_memcached_server_add_unix_socket, -1);
   rb_define_module_function(mRlibmemcached, "memcached_server_add", _wrap_memcached_server_add, -1);
@@ -10118,8 +10130,6 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_module_function(mRlibmemcached, "memcached_servers_parse", _wrap_memcached_servers_parse, -1);
   rb_define_module_function(mRlibmemcached, "memcached_stat_get_value", _wrap_memcached_stat_get_value, -1);
   rb_define_module_function(mRlibmemcached, "memcached_stat_get_keys", _wrap_memcached_stat_get_keys, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_get_by_key", _wrap_memcached_get_by_key, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_mget_by_key", _wrap_memcached_mget_by_key, -1);
   rb_define_module_function(mRlibmemcached, "memcached_delete_by_key", _wrap_memcached_delete_by_key, -1);
   rb_define_module_function(mRlibmemcached, "memcached_fetch_execute", _wrap_memcached_fetch_execute, -1);
   rb_define_module_function(mRlibmemcached, "memcached_callback_set", _wrap_memcached_callback_set, -1);
@@ -10135,6 +10145,7 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_const(mRlibmemcached, "MEMCACHED_STRIDE", SWIG_From_int((int)(4)));
   rb_define_const(mRlibmemcached, "MEMCACHED_DEFAULT_TIMEOUT", SWIG_From_int((int)(1000)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CONTINUUM_ADDITION", SWIG_From_int((int)(10)));
+  rb_define_const(mRlibmemcached, "MEMCACHED_PREFIX_KEY_MAX_SIZE", SWIG_From_int((int)(12)));
   rb_define_const(mRlibmemcached, "MEMCACHED_SUCCESS", SWIG_From_int((int)(MEMCACHED_SUCCESS)));
   rb_define_const(mRlibmemcached, "MEMCACHED_FAILURE", SWIG_From_int((int)(MEMCACHED_FAILURE)));
   rb_define_const(mRlibmemcached, "MEMCACHED_HOST_LOOKUP_FAILURE", SWIG_From_int((int)(MEMCACHED_HOST_LOOKUP_FAILURE)));
@@ -10189,6 +10200,7 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_VERIFY_KEY", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_VERIFY_KEY)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_RETRY_TIMEOUT", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_RETRY_TIMEOUT)));
+  rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_PREFIX_KEY", SWIG_From_int((int)(MEMCACHED_CALLBACK_PREFIX_KEY)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_USER_DATA", SWIG_From_int((int)(MEMCACHED_CALLBACK_USER_DATA)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_CLEANUP_FUNCTION", SWIG_From_int((int)(MEMCACHED_CALLBACK_CLEANUP_FUNCTION)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_CLONE_FUNCTION", SWIG_From_int((int)(MEMCACHED_CALLBACK_CLONE_FUNCTION)));
@@ -10213,6 +10225,12 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_const(mRlibmemcached, "MEMCACHED_NOT_ALLOCATED", SWIG_From_int((int)(MEMCACHED_NOT_ALLOCATED)));
   rb_define_const(mRlibmemcached, "MEMCACHED_ALLOCATED", SWIG_From_int((int)(MEMCACHED_ALLOCATED)));
   rb_define_const(mRlibmemcached, "MEMCACHED_USED", SWIG_From_int((int)(MEMCACHED_USED)));
+  rb_define_module_function(mRlibmemcached, "memcached_get", _wrap_memcached_get, -1);
+  rb_define_module_function(mRlibmemcached, "memcached_mget", _wrap_memcached_mget, -1);
+  rb_define_module_function(mRlibmemcached, "memcached_get_by_key", _wrap_memcached_get_by_key, -1);
+  rb_define_module_function(mRlibmemcached, "memcached_mget_by_key", _wrap_memcached_mget_by_key, -1);
+  rb_define_module_function(mRlibmemcached, "memcached_fetch", _wrap_memcached_fetch, -1);
+  rb_define_module_function(mRlibmemcached, "memcached_fetch_result", _wrap_memcached_fetch_result, -1);
   rb_define_module_function(mRlibmemcached, "memcached_set", _wrap_memcached_set, -1);
   rb_define_module_function(mRlibmemcached, "memcached_add", _wrap_memcached_add, -1);
   rb_define_module_function(mRlibmemcached, "memcached_replace", _wrap_memcached_replace, -1);
@@ -10303,12 +10321,10 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   cMemcachedServerSt.mark = 0;
   cMemcachedServerSt.destroy = (void (*)(void *)) free_memcached_server_st;
   cMemcachedServerSt.trackObjects = 0;
-  rb_define_module_function(mRlibmemcached, "ns", _wrap_ns, -1);
   rb_define_module_function(mRlibmemcached, "memcached_get_rvalue", _wrap_memcached_get_rvalue, -1);
   rb_define_module_function(mRlibmemcached, "memcached_fetch_rvalue", _wrap_memcached_fetch_rvalue, -1);
   rb_define_module_function(mRlibmemcached, "memcached_stat_get_rvalue", _wrap_memcached_stat_get_rvalue, -1);
   rb_define_module_function(mRlibmemcached, "memcached_select_server_at", _wrap_memcached_select_server_at, -1);
   rb_define_module_function(mRlibmemcached, "memcached_select_stat_at", _wrap_memcached_select_stat_at, -1);
-  rb_define_module_function(mRlibmemcached, "memcached_generate_hash", _wrap_memcached_generate_hash, -1);
 }