Date: Thursday, August 3, 2006 @ 17:04:02
Author: csaba
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobStmt.cpp (1.37 -> 1.38)
Check for liveResultSet != 0. Fixes LMS-22.
---------------+
CarobStmt.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.37 libmysequoia/src/CarobStmt.cpp:1.38
--- libmysequoia/src/CarobStmt.cpp:1.37 Wed Aug 2 17:55:26 2006
+++ libmysequoia/src/CarobStmt.cpp Thu Aug 3 17:04:02 2006
@@ -342,8 +342,11 @@
if (p->long_data_used && LONGDATAFIELD(p))
c_stmt->setString(no, to_wstring(*(string
*)LONGDATAFIELD(p)));
else
- // FIXME: can we use strnlen on string???
- c_stmt->setString(no, to_wstring(string((char *)p->buffer,
strnlen((char *)p->buffer, p->buffer_length))));
+ // FIXME: can we use strnlen on string if the user does
not set the length???
+ if (p->length)
+ c_stmt->setString(no, to_wstring(string((char
*)p->buffer, *p->length)));
+ else
+ c_stmt->setString(no, to_wstring(string((char
*)p->buffer, strnlen((char *)p->buffer, p->buffer_length))));
break;
case MYSQL_TYPE_TIME:
case MYSQL_TYPE_DATE:
@@ -494,7 +497,7 @@
try
{
//check if there are more results to fetch
- if (m_stmt->result.data ? m_stmt->data_cursor != 0 : liveResultSet->next())
+ if (liveResultSet ? liveResultSet->next() : m_stmt->data_cursor != 0)
{
MYSQL_FIELD *fPtr = m_stmt->fields;
MYSQL_BIND *bPtr = m_stmt->bind;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
