Merge branch 'garantia-2.6' of https://github.com/GarantiaData/redis into garantia-2.6

src/redis.h

@@ -1079,6 +1079,7 @@ char *sentinelHandleConfiguration(char **argv, int argc);
 
 /* Scripting */
 void scriptingInit(void);
+void scriptingReset(void);
 int luaCreateFunction(redisClient *c, lua_State *lua, char *funcname, robj *body);
 
 /* Git SHA1 */

src/replication.c

@@ -545,6 +545,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
             redisLog(REDIS_NOTICE, "MASTER <-> SLAVE sync: Loading DB in memory");
             signalFlushedDb(-1);
             emptyDb();
+            scriptingReset();
             /* Before loading the DB into memory we need to delete the readable
              * handler, otherwise it will get called recursively since
              * rdbLoad() will call the event loop to process events from time to