diff options
| author | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
| commit | 72aef9c2079eef3104d18e035a5de4ee2931b6a8 (patch) | |
| tree | 351ad59ed8e657c56594971ca07904b6ba65566a /include/violite.h | |
| parent | 32ff7adeb095f4fbdfc478478e661176d1724dee (diff) | |
| parent | 633a2468ec3407d1900b6cce276cc80a89d978a6 (diff) | |
| download | mariadb-git-72aef9c2079eef3104d18e035a5de4ee2931b6a8.tar.gz | |
Merge
include/violite.h:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index a62fe37f45d..97784694e79 100644 --- a/include/violite.h +++ b/include/violite.h @@ -144,8 +144,8 @@ int vio_close_shared_memory(Vio * vio); #if !defined(DONT_MAP_VIO) #define vio_delete(vio) (vio)->viodelete(vio) #define vio_errno(vio) (vio)->vioerrno(vio) -#define vio_read(vio, buf, size) (vio)->read(vio,buf,size) -#define vio_write(vio, buf, size) (vio)->write(vio, buf, size) +#define vio_read(vio, buf, size) ((vio)->read)(vio,buf,size) +#define vio_write(vio, buf, size) ((vio)->write)(vio, buf, size) #define vio_blocking(vio, set_blocking_mode, old_mode)\ (vio)->vioblocking(vio, set_blocking_mode, old_mode) #define vio_is_blocking(vio) (vio)->is_blocking(vio) |