154c154
< static db_result_msg encode_result(db_state *state);
---
> static db_result_msg encode_result(db_state *state, SQLRETURN sql_result);
588c588
< 	msg = encode_result(state);
---
> 	msg = encode_result(state, result);
593c593
< 	    msg = encode_result(state);
---
> 	    msg = encode_result(state, result);
822c822
<                     msg = encode_result(state);
---
>                     msg = encode_result(state, SQL_SUCCESS);
987c987
< static db_result_msg encode_result(db_state *state)
---
> static db_result_msg encode_result(db_state *state, SQLRETURN sql_result)
1000c1000,1005
<   	DO_EXIT(EXIT_COLS); 
---
> 	if(SQL_NO_DATA_FOUND == sql_result) {
> 		num_of_columns = 0;
> 	}
> 	else {
> 		DO_EXIT(EXIT_COLS); 
> 	}
1014c1019,1024
< 	DO_EXIT(EXIT_ROWS); 
---
> 	if(SQL_NO_DATA_FOUND == sql_result) {
> 		RowCountPtr = 0;
> 	}
> 	else {
> 		DO_EXIT(EXIT_ROWS); 
> 	}
2478,2480c2488,2489
< 	if(result != SQL_SUCCESS && result != SQL_NO_DATA) {
< 
<       
---
> 	/* SQL_SUCCESS_WITH_INFO not handled yet. SQL_NO_DATA indicates end of diag recs */
> 	if(result != SQL_SUCCESS) {