diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:56:09 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:56:09 +0300 |
| commit | be565cfbf7cf0379635dd10cdbfc4d4f98977fd8 (patch) | |
| tree | 32ad2b453c07e081d1b3b23780b839058042626d /include/mysql.h | |
| parent | 8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62 (diff) | |
| parent | 392ba75773c394e8a3dcc00dd0156f45d7aca6ba (diff) | |
| download | mariadb-git-be565cfbf7cf0379635dd10cdbfc4d4f98977fd8.tar.gz | |
Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 4 |
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 |