diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-12 15:25:59 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-12 15:25:59 +0100 |
| commit | c3047a7eff1e544fbf496233ca0645c18e859eb6 (patch) | |
| tree | e9526d7322423bd192b99a56657a8dc9437cee1d /client | |
| parent | 54e7b4e99f0b7ee29f1ded4485a0fb53aa4927a0 (diff) | |
| parent | 7aa999607a5ed0dcf6c93bf511b858afa4563297 (diff) | |
| download | mariadb-git-c3047a7eff1e544fbf496233ca0645c18e859eb6.tar.gz | |
merge from 5.5 main
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqladmin.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 4c4747c25de..2c10fdbe853 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ #include "client_priv.h" #include <signal.h> -#ifdef THREAD #include <my_pthread.h> /* because of signal() */ -#endif #include <sys/stat.h> #include <mysql.h> #include <sql_common.h> |