bk commit into 4.1 tree (1.1554)

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1554 03/04/28 14:25:29 hf@xxxxxxxxxxxxxxxxx +5 -0
  SCRUM
  Protocol_cursor task
  net_field_length definitions trimmed with Monty's suggestions

  sql/mini_client.cc
    1.62 03/04/28 14:25:23 hf@xxxxxxxxxxxxxxxxx +1 -1
    unnecessary cast removed

  include/mysql_com.h
    1.69 03/04/28 14:25:23 hf@xxxxxxxxxxxxxxxxx +1 -0
    net_field_length_ll definition is here now

  include/mysql.h
    1.66 03/04/28 14:25:23 hf@xxxxxxxxxxxxxxxxx +2 -4
    we define my_ulonglong here only if no global.h included

  include/my_global.h
    1.44 03/04/28 14:25:23 hf@xxxxxxxxxxxxxxxxx +9 -0
    my_ulonglong definition moved here from mysql.h

  BitKeeper/etc/ignore
    1.152 03/04/28 14:25:23 hf@xxxxxxxxxxxxxxxxx +1 -0
    Added sql/pack.c to the ignore list

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: hf
# Host: deer.mysql.r18.ru
# Root: /home/hf/work/mysql-4.1.cursor

--- 1.65/include/mysql.h        Wed Apr 23 19:37:28 2003
+++ 1.66/include/mysql.h        Mon Apr 28 14:25:23 2003
@@ -101,6 +101,7 @@
 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 @@
 #else
 typedef unsigned long long my_ulonglong;
 #endif
+#endif
 
 #define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)
 
@@ -596,10 +598,6 @@
               unsigned long length, my_bool skip_check);
 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 */

--- 1.68/include/mysql_com.h    Wed Apr 23 19:37:28 2003
+++ 1.69/include/mysql_com.h    Mon Apr 28 14:25:23 2003
@@ -332,6 +332,7 @@
 
 #ifdef _global_h
 ulong STDCALL net_field_length(uchar **packet);
+my_ulonglong net_field_length_ll(uchar **packet);
 #endif
 
 #ifdef __cplusplus

--- 1.61/sql/mini_client.cc     Wed Apr 23 19:37:28 2003
+++ 1.62/sql/mini_client.cc     Mon Apr 28 14:25:23 2003
@@ -1303,7 +1303,7 @@
     }
     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 */

--- 1.43/include/my_global.h    Thu Mar 20 00:16:03 2003
+++ 1.44/include/my_global.h    Mon Apr 28 14:25:23 2003
@@ -721,6 +721,15 @@
 #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

--- 1.151/BitKeeper/etc/ignore  Sat Mar 29 21:39:03 2003
+++ 1.152/BitKeeper/etc/ignore  Mon Apr 28 14:25:23 2003
@@ -605,3 +605,4 @@
 myisam/ftbench/var/*
 myisam/ftbench/data
 myisam/ftbench/t
+sql/pack.c

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx