summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_test3.c
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-25 18:03:05 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-25 18:03:05 +0300
commita8d553e0e33f023a5013e8d8c5424791c80e6774 (patch)
treeb7488b7a2e23cf4b596766c1c84f64235543757a /storage/myisam/mi_test3.c
parenta236766eacec44389f908db035e4eac7d4a53d9b (diff)
parent0a9d4e675ad3b176909d30c5a6aa8ab1f0b7186b (diff)
downloadmariadb-git-a8d553e0e33f023a5013e8d8c5424791c80e6774.tar.gz
Manual merge/pull from mysql-next-mr.
Conflicts: - sql/sql_insert.cc
Diffstat (limited to 'storage/myisam/mi_test3.c')
-rw-r--r--storage/myisam/mi_test3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index 5bdc33b8518..6871658e486 100644
--- a/storage/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.c
@@ -109,7 +109,7 @@ int main(int argc,char **argv)
sleep(1);
return 0;
}
- VOID(rnd(1));
+ (void) rnd(1);
}
for (i=0 ; i < forks ; i++)