Index: app_addon_sql_mysql.c
===================================================================
--- app_addon_sql_mysql.c	(revision 493)
+++ app_addon_sql_mysql.c	(working copy)
@@ -362,11 +362,13 @@
 		AST_APP_ARG(fetch);
 		AST_APP_ARG(resultvar);
 		AST_APP_ARG(fetchid);
+		AST_APP_ARG(vars);
 	);
-	char *s5, *s6;
+	char *s5, *s6, *parse;
 	int resultid = -1, numFields, j;
-	
-	AST_NONSTANDARD_APP_ARGS(args, data, ' ');
+
+	parse = ast_strdupa(data);
+	AST_NONSTANDARD_APP_ARGS(args, parse, ' ');
 	sscanf(args.fetchid, "%d", &resultid);
 
 	if (args.resultvar && (resultid >= 0) ) {
@@ -375,7 +377,7 @@
 			if ((mysqlrow = mysql_fetch_row(mysqlres)) != NULL) {
 				numFields = mysql_num_fields(mysqlres);
 				for (j = 0; j < numFields; j++) {
-					s5 = strsep(&data, " ");
+					s5 = strsep(&args.vars, " ");
 					if (s5 == NULL) {
 						ast_log(LOG_WARNING, "ast_MYSQL_fetch: More fields (%d) than variables (%d)\n", numFields, j);
 						break;