A problem with replication with multiple slaves connectiong to a single master fixed...

diff --git a/adlist.c b/adlist.c
index 15b2617c05741d7c89200f6cbd09ff0eb1d4c6df..fd2d6fd142790c5331b1d1450866875f11c6796a 100644 (file)
--- a/adlist.c
+++ b/adlist.c
@@ -1,6 +1,6 @@
 /* adlist.c - A generic doubly linked list implementation
  *
 /* adlist.c - A generic doubly linked list implementation
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/adlist.h b/adlist.h
index 9b5d55939d46e12cf6eaaf59dd39f21878ba0880..41ca13f1fc772e0f7d4bb9f87d13059dd04c2953 100644 (file)
--- a/adlist.h
+++ b/adlist.h
@@ -1,6 +1,6 @@
 /* adlist.h - A generic doubly linked list implementation
  *
 /* adlist.h - A generic doubly linked list implementation
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ae.c b/ae.c
index 8373a0114814a1835c2a36855801a7aee71e3682..c7918ee1d6c52732856e3335197c0dff675f9474 100644 (file)
--- a/ae.c
+++ b/ae.c
@@ -2,7 +2,7 @@
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ae.h b/ae.h
index d9b2cc254f9fd04ce99c36cfd976971947b125a0..a9db18ed93356f759ceee4ecc60c5e68c655db60 100644 (file)
--- a/ae.h
+++ b/ae.h
@@ -2,7 +2,7 @@
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/ae_epoll.c b/ae_epoll.c
index a8cd3adc1d2dc16f02e84cdba90e2123fea739f3..d48977b6533c689f3b89e814a5bdd4b94855946b 100644 (file)
--- a/ae_epoll.c
+++ b/ae_epoll.c
@@ -1,5 +1,5 @@
 /* Linux epoll(2) based ae.c module
 /* Linux epoll(2) based ae.c module

- * Copyright (C) 2009 Salvatore Sanfilippo - antirez@gmail.com
+ * Copyright (C) 2009-2010 Salvatore Sanfilippo - antirez@gmail.com

  * Released under the BSD license. See the COPYING file for more info. */
 
 #include <sys/epoll.h>
  * Released under the BSD license. See the COPYING file for more info. */
 
 #include <sys/epoll.h>

diff --git a/ae_select.c b/ae_select.c
index 6dc825153aa3c5904d65b330db3411655d9774c7..43f5867f369f17bfa6478de713e9902375410a69 100644 (file)
--- a/ae_select.c
+++ b/ae_select.c
@@ -1,5 +1,5 @@
 /* Select()-based ae.c module
 /* Select()-based ae.c module

- * Copyright (C) 2009 Salvatore Sanfilippo - antirez@gmail.com
+ * Copyright (C) 2009-2010 Salvatore Sanfilippo - antirez@gmail.com

  * Released under the BSD license. See the COPYING file for more info. */
 
 #include <string.h>
  * Released under the BSD license. See the COPYING file for more info. */
 
 #include <string.h>

diff --git a/anet.c b/anet.c
index 058fdd614972d309d4a8d66c26d90e9eabc6d655..4fe811a117ee0a8b290b04e1ef1e3df273ec9fde 100644 (file)
--- a/anet.c
+++ b/anet.c
@@ -1,6 +1,6 @@
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/anet.h b/anet.h
index b1e9a5675fc0047478a6f1928f201d088d840a6e..ce0f4778799824c8669e7487035dab6db614c057 100644 (file)
--- a/anet.h
+++ b/anet.h
@@ -1,6 +1,6 @@
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/dict.c b/dict.c
index 6e410b75309e914e66c03ad8d7c46ea0e17e554c..725c9a51b983436cf474d2718c24816bbc69ea6d 100644 (file)
--- a/dict.c
+++ b/dict.c
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/dict.h b/dict.h
index bd935d5f4e75684acc2d3a2faa7474a03df4a2d0..6f9eaa57ba9da5c76cadce37ce571eeccebc1bdc 100644 (file)
--- a/dict.h
+++ b/dict.h
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/pqsort.c b/pqsort.c
index da60fd1ffe686c7ae7e0a543628c9ce1cd983076..257756376c4aca95941737ab6f4e4e89b92eca09 100644 (file)
--- a/pqsort.c
+++ b/pqsort.c
@@ -1,7 +1,7 @@
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges for Redis.
  *
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges for Redis.
  *

- * Copyright(C) 2009 Salvatore Sanfilippo. All rights reserved.
+ * Copyright(C) 2009-2010 Salvatore Sanfilippo. All rights reserved.

  *
  * The original copyright notice follows. */
 
  *
  * The original copyright notice follows. */
 

diff --git a/pqsort.h b/pqsort.h
index af14e31af78a82d0b95a5709af0ef32a1f49f803..5054d5209ac70eacfd08bcabb8c072c0fec3f605 100644 (file)
--- a/pqsort.h
+++ b/pqsort.h
@@ -1,7 +1,7 @@
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges for Redis.
  *
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges for Redis.
  *

- * Copyright(C) 2009 Salvatore Sanfilippo. All rights reserved.
+ * Copyright(C) 2009-2010 Salvatore Sanfilippo. All rights reserved.

  *
  * See the pqsort.c file for the original copyright notice. */
 
  *
  * See the pqsort.c file for the original copyright notice. */
 

diff --git a/redis-benchmark.c b/redis-benchmark.c
index 5bde1c35397096ca6f0c3364db4036072512addb..06057b0debacb03c77d2e5001d6bb3c6dcaf7252 100644 (file)
--- a/redis-benchmark.c
+++ b/redis-benchmark.c
@@ -1,6 +1,6 @@
 /* Redis benchmark utility.
  *
 /* Redis benchmark utility.
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/redis-cli.c b/redis-cli.c
index 524b74ab57744abb0180297d0b2ac03165bddcaa..58c17613e283f2ab5e4eb896ca6107515b63994f 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -1,6 +1,6 @@
 /* Redis CLI (command line interface)
  *
 /* Redis CLI (command line interface)
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/redis.c b/redis.c
index a961c24708baf00e9b170f1e529af1b9a758940d..972ebf06036e204b6479651ff7e01de3b14c7997 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -2346,7 +2346,7 @@ static int selectDb(redisClient *c, int id) {
 
 static void *dupClientReplyValue(void *o) {
     incrRefCount((robj*)o);
 
 static void *dupClientReplyValue(void *o) {
     incrRefCount((robj*)o);

-    return 0;
+    return o;

 }
 
 static redisClient *createClient(int fd) {
 }
 
 static redisClient *createClient(int fd) {

diff --git a/redis.h b/redis.h
index f2524c1cc590eb4e4e41ae79794c88b29cbe27d0..18816844f0db10be7acd3df44f9afefc6e07dd86 100644 (file)
--- a/redis.h
+++ b/redis.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sds.c b/sds.c
index 247b7c30d57d0df9b0234ebe0ddd34e8d11b027e..8d1edcb7ec977d9969b9146a436935dcd4c3eb81 100644 (file)
--- a/sds.c
+++ b/sds.c
@@ -1,6 +1,6 @@
 /* SDSLib, A C dynamic strings library
  *
 /* SDSLib, A C dynamic strings library
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sds.h b/sds.h
index d3a7a3a9f88692650767b572d53e40f24b6da598..c8b42f7743cf4820776e5b68e98ebd5d854b2975 100644 (file)
--- a/sds.h
+++ b/sds.h
@@ -1,6 +1,6 @@
 /* SDSLib, A C dynamic strings library
  *
 /* SDSLib, A C dynamic strings library
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/zmalloc.c b/zmalloc.c
index 8bf73b262ccfad2cfc1089fc47267309b7baafce..b1e96fc3c42149f367ed6cea6993dad93fb019f3 100644 (file)
--- a/zmalloc.c
+++ b/zmalloc.c
@@ -1,6 +1,6 @@
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/zmalloc.h b/zmalloc.h
index fbe790302a301fee07daf0bd0c3b5e6920ab0399..193e7eda5c04f6b7288a5f52b7dd35ac06c76ba1 100644 (file)
--- a/zmalloc.h
+++ b/zmalloc.h
@@ -1,6 +1,6 @@
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without