diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-04-28 14:25:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-04-28 14:25:29 +0500 |
| commit | c13f5558612fe0fa08d2a15c08baad21c0ebd672 (patch) | |
| tree | 14113f438785e6e62ca154ee35d77c9c5f1ae6c9 /include/mysql.h | |
| parent | f0909cd71a7a1d0904845af4e5e06d213f911de1 (diff) | |
| download | mariadb-git-c13f5558612fe0fa08d2a15c08baad21c0ebd672.tar.gz | |
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
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/mysql.h b/include/mysql.h index af1073237cf..0952c1c62a8 100644 --- a/include/mysql.h +++ b/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 |