diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:29:32 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:29:32 -0600 |
| commit | b28bfc7a26aba7c2fde06265518e6f80ef21c8b2 (patch) | |
| tree | 414a7895ab0ea30ccecf42aaa9be90816b2e19ed /include | |
| parent | 0c2d19b5b5a7157e73743701ebe90c3b194ccfd0 (diff) | |
| parent | 5c1dbfe6a7f42e368bfffb90974effbb8c6b9f6e (diff) | |
| download | mariadb-git-b28bfc7a26aba7c2fde06265518e6f80ef21c8b2.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/join.test:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 439354c5d98..5158fef6045 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -238,7 +238,7 @@ typedef struct st_mysql_res { typedef struct st_mysql_manager { - Vio* vio; + NET net; char *host,*user,*passwd; unsigned int port; my_bool free_me; |