Merge branch 'develop' into MAX-309

server/core/buffer.c

@@ -569,7 +569,10 @@ int	len;
 
 	if ((newbuf = gwbuf_alloc(gwbuf_length(orig))) != NULL)
 	{
+		newbuf->gwbuf_type = orig->gwbuf_type;
+		newbuf->hint = hint_dup(orig->hint);
 		ptr = GWBUF_DATA(newbuf);
+		
 		while (orig)
 		{
 			len = GWBUF_LENGTH(orig);

server/core/hint.c

@@ -38,6 +38,8 @@
  *
  * @param hint		The hint list to duplicate
  * @return 	A duplicate of the list
+ * 
+ * Note : Optimize this to use version numbering instead of copying memory
  */
 HINT *
 hint_dup(HINT *hint)

server/core/modutil.c

@@ -167,6 +167,7 @@ GWBUF	*addition;
 		*ptr++ = (newlength + 1) & 0xff;
 		*ptr++ = ((newlength + 1) >> 8) & 0xff;
 		*ptr++ = ((newlength + 1) >> 16) & 0xff;
+		addition->gwbuf_type = orig->gwbuf_type;
 		orig->next = addition;
 	}
 

server/core/test/CMakeLists.txt

@@ -11,7 +11,7 @@ add_executable(test_service testservice.c)
 add_executable(test_server testserver.c)
 add_executable(test_users testusers.c)
 add_executable(test_adminusers testadminusers.c)
-target_link_libraries(test_mysql_users fullcore MySQLClient)
+target_link_libraries(test_mysql_users MySQLClient fullcore)
 target_link_libraries(test_hash fullcore)
 target_link_libraries(test_hint fullcore)
 target_link_libraries(test_spinlock fullcore)

server/core/test/makefile

@@ -42,6 +42,13 @@ testhash: testhash.c
 	-I$(ROOT_PATH)/utils \
 	testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash
 
+testmysqlusers: test_mysql_users.c 
+	$(CC) $(CFLAGS) \
+	-I$(ROOT_PATH)/server/include \
+	-I$(ROOT_PATH)/utils \
+	test_mysql_users.c ../hashtable.o ../atomic.o ../modutil.o ../spinlock.o -o testmysqlusers
+
+
 testspinlock: testspinlock.c 
 	$(CC) $(CFLAGS) \
 	-I$(ROOT_PATH)/server/include \

server/core/test/testsession.c

@@ -0,0 +1,77 @@
+/*
+ * This file is distributed as part of MaxScale.  It is free
+ * software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation,
+ * version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright MariaDB Corporation Ab 2014
+ */
+
+/**
+ *
+ * @verbatim
+ * Revision History
+ *
+ * Date		Who			Description
+ * 11-09-2014	Martin Brampton		Initial implementation
+ *
+ * @endverbatim
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <poll.h>
+#include <dcb.h>
+
+/**
+ * test1	Allocate a service and do lots of other things
+ *
+  */
+
+static int
+test1()
+{
+DCB     *dcb;
+int     result;
+
+        /* Poll tests */  
+        ss_dfprintf(stderr,
+                    "testpoll : Initialise the polling system."); 
+        poll_init();
+        ss_dfprintf(stderr, "\t..done\nAdd a DCB");
+        dcb = dcb_alloc(DCB_ROLE_SERVICE_LISTENER);
+        dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        poll_add_dcb(dcb);
+        poll_remove_dcb(dcb);
+        poll_add_dcb(dcb);
+        ss_dfprintf(stderr, "\t..done\nStart wait for events.");
+        sleep(10);
+        poll_shutdown();
+        ss_dfprintf(stderr, "\t..done\nTidy up.");
+        dcb_free(dcb);
+        ss_dfprintf(stderr, "\t..done\n");
+		
+	return 0;
+        
+}
+
+int main(int argc, char **argv)
+{
+int	result = 0;
+
+	result += test1();
+
+	exit(result);
+}
+

server/core/users.c

@@ -106,6 +106,8 @@ int	add;
 /**
  * Delete a user from the user table.
  *
+ * The last user in the table can not be deleted
+ *
  * @param users		The users table
  * @param user		The user name
  * @return	The number of users deleted from the table
@@ -115,12 +117,12 @@ users_delete(USERS *users, char *user)
 {
 int	del;
 
-	atomic_add(&users->stats.n_deletes, 1);
         if (users->stats.n_entries == 1) {
             return 0;
         }
+	atomic_add(&users->stats.n_deletes, 1);
 	del = hashtable_delete(users->data, user);
-	atomic_add(&users->stats.n_entries, del * -1);
+	atomic_add(&users->stats.n_entries, -del);
 	return del;
 }