database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SCRUM

Browse Source 
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
This commit is contained in:
unknown
2003-04-28 14:25:29 +05:00
parent f0909cd71a
commit c13f555861
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mysql.h
View File

@ -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