diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
| commit | a8d553e0e33f023a5013e8d8c5424791c80e6774 (patch) | |
| tree | b7488b7a2e23cf4b596766c1c84f64235543757a /storage/myisam/mi_statrec.c | |
| parent | a236766eacec44389f908db035e4eac7d4a53d9b (diff) | |
| parent | 0a9d4e675ad3b176909d30c5a6aa8ab1f0b7186b (diff) | |
| download | mariadb-git-a8d553e0e33f023a5013e8d8c5424791c80e6774.tar.gz | |
Manual merge/pull from mysql-next-mr.
Conflicts:
- sql/sql_insert.cc
Diffstat (limited to 'storage/myisam/mi_statrec.c')
| -rw-r--r-- | storage/myisam/mi_statrec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c index e3771560c01..74fca5902f5 100644 --- a/storage/myisam/mi_statrec.c +++ b/storage/myisam/mi_statrec.c @@ -282,7 +282,7 @@ int _mi_read_rnd_static_record(MI_INFO *info, uchar *buf, info->s->base.pack_reclength - info->s->base.reclength); } if (locked) - VOID(_mi_writeinfo(info,0)); /* Unlock keyfile */ + (void) _mi_writeinfo(info,0); /* Unlock keyfile */ if (!error) { if (!buf[0]) |