SCRUM

Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions


BitKeeper/etc/ignore:
  Added sql/pack.c to the ignore list
include/my_global.h:
  my_ulonglong definition moved here from mysql.h
include/mysql.h:
  we define my_ulonglong here only if no global.h included
include/mysql_com.h:
  net_field_length_ll definition is here now
sql/mini_client.cc:
  unnecessary cast removed

.bzrignore

@@ -605,3 +605,4 @@ vio/viotest-ssl
 myisam/ftbench/var/*
 myisam/ftbench/data
 myisam/ftbench/t
+sql/pack.c

include/my_global.h

@@ -721,6 +721,15 @@ typedef long		longlong;
 #endif
 #endif
 
+#if defined(NO_CLIENT_LONG_LONG)
+typedef unsigned long my_ulonglong;
+#elif defined (__WIN__)
+typedef unsigned __int64 my_ulonglong;
+#else
+typedef unsigned long long my_ulonglong;
+#endif
+
+
 #ifdef USE_RAID
 /*
   The following is done with a if to not get problems with pre-processors

include/mysql.h

@@ -101,6 +101,7 @@ typedef struct st_mysql_field {
 typedef char **MYSQL_ROW;		/* return data as array of strings */
 typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
 
+#ifndef _global_h
 #if defined(NO_CLIENT_LONG_LONG)
 typedef unsigned long my_ulonglong;
 #elif defined (__WIN__)
@@ -108,6 +109,7 @@ typedef unsigned __int64 my_ulonglong;
 #else
 typedef unsigned long long my_ulonglong;
 #endif
+#endif
 
 #define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)
 
@@ -597,10 +599,6 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
 unsigned long net_safe_read(MYSQL* mysql);
 void mysql_once_init(void);
 
-#ifdef _global_h
-my_ulonglong net_field_length_ll(uchar **packet);
-#endif
-
 #ifdef __NETWARE__
 #pragma pack(pop)		/* restore alignment */
 #endif

include/mysql_com.h

@@ -332,6 +332,7 @@ void my_thread_end(void);
 
 #ifdef _global_h
 ulong STDCALL net_field_length(uchar **packet);
+my_ulonglong net_field_length_ll(uchar **packet);
 #endif
 
 #ifdef __cplusplus

sql/mini_client.cc

@@ -1303,7 +1303,7 @@ static int mc_read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row,
     }
     if (prev_pos)
       *prev_pos=0;				/* Terminate prev field */
-    prev_pos= (uchar *)pos;
+    prev_pos= pos;
   }
   row[field]=(char*) prev_pos+1;		/* End of last field */
   *prev_pos=0;					/* Terminate last field */