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 /client/mysqladmin.cc | |
| 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 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 3484cf08713..2c4a20f2786 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -326,8 +326,8 @@ int main(int argc,char *argv[]) if (tty_password) opt_password = get_tty_password(NullS); - VOID(signal(SIGINT,endprog)); /* Here if abort */ - VOID(signal(SIGTERM,endprog)); /* Here if abort */ + (void) signal(SIGINT,endprog); /* Here if abort */ + (void) signal(SIGTERM,endprog); /* Here if abort */ if (opt_compress) mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS); |