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/myisammrg/myrg_create.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/myisammrg/myrg_create.c')
| -rw-r--r-- | storage/myisammrg/myrg_create.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/myrg_create.c b/storage/myisammrg/myrg_create.c index eaed470daec..b030340e743 100644 --- a/storage/myisammrg/myrg_create.c +++ b/storage/myisammrg/myrg_create.c @@ -66,7 +66,7 @@ err: save_errno=my_errno ? my_errno : -1; switch (errpos) { case 1: - VOID(my_close(file,MYF(0))); + (void) my_close(file,MYF(0)); } DBUG_RETURN(my_errno=save_errno); } /* myrg_create */ |