summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-10-03 15:07:03 +0400
committerpeter@mysql.com <>2002-10-03 15:07:03 +0400
commit0dc8dc2d5d971b08cb77bd6775341df657493725 (patch)
tree9b86d3ca7e4fd7755ddd1c1e5bd1f89ef9d3277a
parent66b1435ee267cda9e57ad4016094b427b86d06cd (diff)
parent2dae97b139287c0b607ef01087c91090c16f5a04 (diff)
downloadmariadb-git-0dc8dc2d5d971b08cb77bd6775341df657493725.tar.gz
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
-rw-r--r--include/mysql.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h
index 376de1a0e08..64b118ca8b1 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -447,7 +447,7 @@ typedef struct st_mysql_stmt
unsigned long param_count; /* parameters count */
unsigned long field_count; /* fields count */
unsigned long long_length; /* long buffer alloced length */
- ulong stmt_id; /* Id for prepared statement */
+ unsigned long stmt_id; /* Id for prepared statement */
uint last_errno; /* error code */
enum MY_STMT_STATE state; /* statement state */
char last_error[MYSQL_ERRMSG_SIZE]; /* error message */
@@ -506,7 +506,7 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
my_bool
simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
- ulong length, my_bool skip_check);
+ unsigned long length, my_bool skip_check);
unsigned long net_safe_read(MYSQL* mysql);
#ifdef __cplusplus