[libdbi-cvs] libdbi/drivers/mysql dbd_mysql.c,1.61,1.62

[<da...@br...>]

Update of /home/cvs/libdbi/drivers/mysql
In directory backbeat:/tmp/cvs-serv10373/drivers/mysql

Modified Files:
	dbd_mysql.c 
Log Message:
finally killed off the enum/set nastiness


Index: dbd_mysql.c
===================================================================
RCS file: /home/cvs/libdbi/drivers/mysql/dbd_mysql.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- dbd_mysql.c	20 Dec 2002 06:36:34 -0000	1.61
+++ dbd_mysql.c	26 Feb 2003 22:11:32 -0000	1.62
@@ -432,6 +432,9 @@
 			case DBI_TYPE_BINARY:
 				row->field_sizes[curfield] = (unsigned long long) strsizes[curfield];
 				data->d_string = malloc(strsizes[curfield]+1); // one extra char for libdbi's null
+				if (!data->d_string) {
+					break;
+				}
 				memcpy(data->d_string, raw, strsizes[curfield]);
 				data->d_string[strsizes[curfield]] = '\0'; // manually null-terminate the data so C string casting still works
 				if (dbi_conn_get_option_numeric(result->conn, "mysql_include_trailing_null") == 1) {
@@ -443,8 +446,6 @@
 				data->d_datetime = _parse_datetime(raw, sizeattrib);
 				break;
 				
-			case DBI_TYPE_ENUM:
-			case DBI_TYPE_SET:
 			default:
 				data->d_string = strdup(raw);
 				row->field_sizes[curfield] = (unsigned long long) strsizes[curfield];