summaryrefslogtreecommitdiff
path: root/sql/protocol_cursor.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-28 12:18:13 +0200
committermonty@mysql.com <>2003-11-28 12:18:13 +0200
commitede8169d24c56a4e264034b3a098477072532ca5 (patch)
treee5a58d3f07e9cca109d78031822106ff2be7f6f8 /sql/protocol_cursor.cc
parent7733969bf65befdbf1fd4445ec6b7efa43b61492 (diff)
downloadmariadb-git-ede8169d24c56a4e264034b3a098477072532ca5.tar.gz
Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log
Diffstat (limited to 'sql/protocol_cursor.cc')
-rw-r--r--sql/protocol_cursor.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc
index 563a2d41019..5f35552c562 100644
--- a/sql/protocol_cursor.cc
+++ b/sql/protocol_cursor.cc
@@ -96,23 +96,23 @@ bool Protocol_cursor::write()
MYSQL_FIELD *cur_field= fields;
MYSQL_FIELD *fields_end= fields + field_count;
MYSQL_ROWS *new_record;
- byte **data;
+ byte **data_tmp;
byte *to;
new_record= (MYSQL_ROWS *)alloc_root(alloc,
sizeof(MYSQL_ROWS) + (field_count + 1)*sizeof(char *) + packet->length());
if (!new_record)
goto err;
- data= (byte **)(new_record + 1);
- new_record->data= (char **)data;
+ data_tmp= (byte **)(new_record + 1);
+ new_record->data= (char **)data_tmp;
to= (byte *)(fields + field_count + 1);
- for (; cur_field < fields_end; ++cur_field, ++data)
+ for (; cur_field < fields_end; ++cur_field, ++data_tmp)
{
if ((len=net_field_length((uchar **)&cp)))
{
- *data= 0;
+ *data_tmp= 0;
}
else
{