From: foobar <sniper@php.net>
Date: Thu, 28 Aug 2003 16:16:59 +0000 (+0000)
Subject: - Fixed bug #23682 (sybase_query() and multiple result sets: not returning first... 
X-Git-Tag: php-4.3.4RC1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3782f212224e166c8b03a1f8bd101e23f6a2bef2;p=php

- Fixed bug #23682 (sybase_query() and multiple result sets: not returning first row set)
---

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index bbb6c1a313..276586826b 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1386,8 +1386,21 @@ static void php_sybase_query (INTERNAL_FUNCTION_PARAMETERS, int buffered)
 					case CS_CURSOR_RESULT:
 					case CS_PARAM_RESULT:
 					case CS_ROW_RESULT:
-						/* Unexpected results, cancel them. */
+						if (status != Q_RESULT) {
+							result = php_sybase_fetch_result_set(sybase_ptr, buffered, store);
+							if (result == NULL) {
+								ct_cancel(NULL, sybase_ptr->cmd, CS_CANCEL_ALL);
+								sybase_ptr->dead = 1;
+								RETURN_FALSE;
+							}
+							status = Q_RESULT;
+						} else {
+							/* Unexpected results, cancel them. */
+							ct_cancel(NULL, sybase_ptr->cmd, CS_CANCEL_CURRENT);
+						}
+						break;
 					case CS_STATUS_RESULT:
+						/* Unexpected results, cancel them. */
 						ct_cancel(NULL, sybase_ptr->cmd, CS_CANCEL_CURRENT);
 						break;