mirror of
https://github.com/fluencelabs/redis
synced 2025-08-01 00:41:56 +00:00
Merge branch 'unstable' of github.com:/antirez/redis into unstable
This commit is contained in:
2
src/db.c
2
src/db.c
@@ -1028,7 +1028,7 @@ void scanDatabaseForReadyLists(redisDb *db) {
|
||||
*
|
||||
* Returns C_ERR if at least one of the DB ids are out of range, otherwise
|
||||
* C_OK is returned. */
|
||||
int dbSwapDatabases(int id1, int id2) {
|
||||
int dbSwapDatabases(long id1, long id2) {
|
||||
if (id1 < 0 || id1 >= server.dbnum ||
|
||||
id2 < 0 || id2 >= server.dbnum) return C_ERR;
|
||||
if (id1 == id2) return C_OK;
|
||||
|
@@ -507,7 +507,7 @@ void addReplyDouble(client *c, double d) {
|
||||
if (c->resp == 2) {
|
||||
addReplyBulkCString(c, d > 0 ? "inf" : "-inf");
|
||||
} else {
|
||||
addReplyProto(c, d > 0 ? ",inf\r\n" : "-inf\r\n",
|
||||
addReplyProto(c, d > 0 ? ",inf\r\n" : ",-inf\r\n",
|
||||
d > 0 ? 6 : 7);
|
||||
}
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user