Merge branch 'develop' into MAX-324

2015-02-06 23:27:59 +02:00
parent 4c16eb55a2 6e3e4ef20a
commit 0d4761ade8
25 changed files with 59552 additions and 959 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -325,7 +325,7 @@ static int hashkeyfun(
  while((c = *ptr++)){
    hash = c + (hash << 6) + (hash << 16) - hash;
  }
-  return *(int *)key;
+  return hash;
 }

 static int hashcmpfun(