diff options
| author | Zeev Suraski <zeev@php.net> | 2003-07-28 07:28:55 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-07-28 07:28:55 +0000 |
| commit | 97662dc30e5a9876a4256bfabb76b119a761382a (patch) | |
| tree | b917f9c8047a1129bbc3cedf5f12bec19fcb8787 /ext/mysql/libmysql/libmysql.c | |
| parent | fc8b10cf712de512b24438285a856bd51bcf3bef (diff) | |
| download | php-git-97662dc30e5a9876a4256bfabb76b119a761382a.tar.gz | |
Fix nameclash with NSAPI API
Diffstat (limited to 'ext/mysql/libmysql/libmysql.c')
| -rw-r--r-- | ext/mysql/libmysql/libmysql.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysql/libmysql/libmysql.c b/ext/mysql/libmysql/libmysql.c index 433de0380e..94d6352252 100644 --- a/ext/mysql/libmysql/libmysql.c +++ b/ext/mysql/libmysql/libmysql.c @@ -1510,7 +1510,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, /* without encryption? */ if (client_flag & CLIENT_SSL) { - if (my_net_write(net,buff,(uint) (2)) || net_flush(net)) + if (my_net_write(net,buff,(uint) (2)) || my_net_flush(net)) goto error; /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); @@ -1543,7 +1543,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, mysql->db=my_strdup(db,MYF(MY_WME)); db=0; } - if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net) || + if (my_net_write(net,buff,(uint) (end-buff)) || my_net_flush(net) || net_safe_read(mysql) == packet_error) goto error; if (client_flag & CLIENT_COMPRESS) /* We will use compression */ @@ -1808,7 +1808,7 @@ send_file_to_server(MYSQL *mysql, const char *filename) mysql->net.last_errno=EE_FILENOTFOUND; sprintf(buf,EE(mysql->net.last_errno),tmp_name,errno); strmake(mysql->net.last_error,buf,sizeof(mysql->net.last_error)-1); - my_net_write(&mysql->net,"",0); net_flush(&mysql->net); + my_net_write(&mysql->net,"",0); my_net_flush(&mysql->net); my_free(tmp_name,MYF(0)); DBUG_RETURN(-1); } @@ -1827,7 +1827,7 @@ send_file_to_server(MYSQL *mysql, const char *filename) } (void) my_close(fd,MYF(0)); /* Send empty packet to mark end of file */ - if (my_net_write(&mysql->net,"",0) || net_flush(&mysql->net)) + if (my_net_write(&mysql->net,"",0) || my_net_flush(&mysql->net)) { mysql->net.last_errno=CR_SERVER_LOST; sprintf(mysql->net.last_error,ER(mysql->net.last_errno),socket_errno); |