Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh

.gitignore

@@ -1,4 +1,35 @@
-server/core/tags
+# Object files
-server/core/maxscale
+*.o
-server/core/maxkeys
+*.ko
-server/core/maxpasswd
+*.lo
+
+# Libraries
+*.lib
+*.a
+*.la
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# log files (from testing etc.)
+*.log
+
+# "make depend" generated stuff
+depend
+depend.mk
+
+# various auto-backup stuff
+*~
+*#
+.#*
+
+# Vi swap files
+.*.swp

client/.gitignore

@@ -0,0 +1,2 @@
+# binaries generated here
+maxadmin

log_manager/.gitignore

@@ -1,5 +0,0 @@
-*.o
-*.so
-*.so.*
-depend.mk
-

log_manager/test/.gitignore

@@ -0,0 +1,2 @@
+# binaries generated here 
+testlog

query_classifier/.gitignore

@@ -1,5 +0,0 @@
-*.o
-*.so
-*.so.*
-depend.mk
-

query_classifier/test/.gitignore

@@ -0,0 +1,2 @@
+# binaries generated here
+testmain

server/core/.gitignore

@@ -1,3 +1,4 @@
-*.o
+# binaries generated here
 maxscale
-depend.mk
+maxkeys
+maxpasswd

server/core/dbusers.c

@@ -359,10 +359,10 @@ getUsers(SERVICE *service, struct users *users)
 					row[0],
 					row[1],
 					rc == NULL ? "NULL" : ret_ip)));
-
-				continue;
 			}
 
+			free(key.user);
+
 		} else {
 			/* setipaddress() failed, skip user add and log this*/
 			LOGIF(LE, (skygw_log_write_flush(
@@ -380,7 +380,6 @@ getUsers(SERVICE *service, struct users *users)
 	memcpy(users->cksum, hash, SHA_DIGEST_LENGTH);
 
 	free(users_data);
-	free(key.user);
 	mysql_free_result(result);
 	mysql_close(con);
 

server/core/test/.gitignore

@@ -0,0 +1,2 @@
+#binaries generated here
+testhash

server/modules/monitor/.gitignore

@@ -1,3 +0,0 @@
-*.o
-*.so
-depend.mk

server/modules/protocol/.gitignore

@@ -1,3 +0,0 @@
-*.o
-*.so
-depend.mk

server/modules/routing/.gitignore

@@ -1,3 +0,0 @@
-*.o
-*.so
-depend.mk

server/modules/routing/readconnroute.c

@@ -264,11 +264,11 @@ char		*weightby;
 		{
 			for (n = 0; inst->servers[n]; n++)
 			{
-				int perc;
+				int perc, wght;
 				backend = inst->servers[n];
-				perc = (atoi(serverGetParameter(backend->server,
+				perc = ((wght = atoi(serverGetParameter(backend->server,
-						weightby)) * 1000) / total;
+						weightby))) * 1000) / total;
-				if (perc == 0)
+				if (perc == 0 && wght != 0)
 					perc = 1;
 				backend->weight = perc;
 				if (perc == 0)
@@ -279,7 +279,7 @@ char		*weightby;
 						"for weighting parameter '%s', "
 						"no queries will be routed to "
 						"this server.\n",
-						server->unique_name,
+						inst->servers[n]->server->unique_name,
 						weightby)));
 				}
 		
@@ -418,6 +418,9 @@ BACKEND *master_host = NULL;
 		if (SERVER_IN_MAINT(inst->servers[i]->server))
 			continue;
 
+		if (inst->servers[i]->weight == 0)
+			continue;
+
 		/* Check server status bits against bitvalue from router_options */
 		if (inst->servers[i] &&
 			SERVER_IS_RUNNING(inst->servers[i]->server) &&

server/modules/routing/readwritesplit/.gitignore

@@ -1,3 +0,0 @@
-*.o
-*.so
-depend.mk

server/test/.gitignore

@@ -0,0 +1,8 @@
+# directories generated/filled by "make testall"
+bin/
+Documentation/
+etc/
+lib/
+log/
+modules/
+mysql/

utils/.gitignore

@@ -1 +0,0 @@
-*.o