Index: librtgmysql.c
===================================================================
RCS file: /cvsroot/rtg/rtg/src/librtgmysql.c,v
retrieving revision 1.12
diff -u -r1.12 librtgmysql.c
--- librtgmysql.c	19 Jan 2008 03:01:32 -0000	1.12
+++ librtgmysql.c	20 Mar 2008 14:07:00 -0000
@@ -39,18 +39,18 @@
 }
 
 /* return the thread-specific mysql variable */
-MYSQL getmysql() {
+MYSQL * getmysql() {
 	MYSQL *mysql;
 	/* if this fails it will just return NULL */
 	mysql = pthread_getspecific(key);
 
-	return(*mysql);
+	return(mysql);
 }
 
 /* utility function to safely escape table names */
 char *escape_string(char *output, char *input)
 {
-	MYSQL mysql = getmysql();
+	MYSQL * mysql = getmysql();
 
 	/* length of string */
 	size_t input_len = strlen(input);
@@ -61,7 +61,7 @@
 
 	/* TODO check return */
 	/* escape the string */
-	mysql_real_escape_string(&mysql, scratch, input, input_len);
+	mysql_real_escape_string(mysql, scratch, input, input_len);
 
 	/* set output to correct length string, including NUL */
 	asprintf(&output, "%s", scratch);
@@ -76,9 +76,9 @@
  * we don't try and reconnect because this is sometimes used to confirm a disconnect
  */
 int __db_status() {
-	MYSQL mysql = getmysql();
+	MYSQL * mysql = getmysql();
 
-	if (mysql_ping(&mysql) == 0) {
+	if (mysql_ping(mysql) == 0) {
 		return TRUE;
 	} else {
 		return FALSE;
@@ -138,10 +138,10 @@
 }
 
 int __db_disconnect() {
-	MYSQL mysql = getmysql();
+	MYSQL * mysql = getmysql();
 
 	/* no return value to check */
-	mysql_close(&mysql);
+	mysql_close(mysql);
 
 	debug(LOW, "Mysql connection closed\n");
 
@@ -149,7 +149,7 @@
 }
 
 int __db_insert(char *table, int iid, unsigned long long insert_val, double insert_rate) {
-	MYSQL mysql = getmysql();
+	MYSQL * mysql = getmysql();
 
 	char *query;
 
@@ -169,14 +169,14 @@
 
 	/* now execute the query */
 
-	result = mysql_real_query(&mysql, query, strlen(query));
+	result = mysql_real_query(mysql, query, strlen(query));
 
 	free(query);
 
 	if (result == 0) {
 		return TRUE;
 	} else {
-		debug(LOW, "MySQL error: %s\n", mysql_error(&mysql));
+		debug(LOW, "MySQL error: %s\n", mysql_error(mysql));
 		return FALSE;
 	}
 }
@@ -187,11 +187,11 @@
     struct timespec ts2;
     unsigned int ms_took;
     int com_ret;
-    MYSQL mysql = getmysql();
+    MYSQL * mysql = getmysql();
 
     clock_gettime(CLOCK_REALTIME,&ts1);
     
-    com_ret = mysql_commit(&mysql);
+    com_ret = mysql_commit(mysql);
 
     clock_gettime(CLOCK_REALTIME,&ts2);
     
@@ -206,17 +206,17 @@
 #else
 long __db_intSpeed(char *query) {
 #endif
-    MYSQL mysql = getmysql();
+    MYSQL * mysql = getmysql();
     int result; 
     MYSQL_RES *result2;
     MYSQL_ROW row;
 
-    result = mysql_real_query(&mysql, query, strlen(query));
+    result = mysql_real_query(mysql, query, strlen(query));
 
     if (result == 0) {
-        result2 = mysql_store_result(&mysql);
+        result2 = mysql_store_result(mysql);
     } else { 
-        debug(LOW, "MySQL error: %s\n", mysql_error(&mysql));
+        debug(LOW, "MySQL error: %s\n", mysql_error(mysql));
         return FALSE;
     }
 
@@ -235,19 +235,18 @@
     data_t *new = NULL;
     data_t *last = NULL;
     data_t **data = &(DO->data);
-    int stat;
-    MYSQL mysql = getmysql();
+    MYSQL * mysql = getmysql();
     int res;
     MYSQL_RES *result;
     MYSQL_ROW row;
 
-    res = mysql_real_query(&mysql, query, strlen(query));
+    res = mysql_real_query(mysql, query, strlen(query));
 
     if (res != 0) {
-        debug(LOW, "MySQL error: %s\n", mysql_error(&mysql));
+        debug(LOW, "MySQL error: %s\n", mysql_error(mysql));
         return FALSE;
     } else {
-        result = mysql_store_result(&mysql);
+        result = mysql_store_result(mysql);
     }
 
     while ((row = mysql_fetch_row(result))) {
@@ -273,6 +272,6 @@
         }
     }
 
-    return stat;
+    return TRUE;
 }