diff options
| author | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
| commit | 113a99626d3debba5b5c7c574f20734ae8c025de (patch) | |
| tree | 21533890f530ab28e8f4542b5f7ca2deada7e9da /client/mysqladmin.cc | |
| parent | b884660a8366ce689efe3f6f135afb753a499fe7 (diff) | |
| parent | efb5ed5bab9699731c47894a6a1e805a303f6b37 (diff) | |
| download | mariadb-git-113a99626d3debba5b5c7c574f20734ae8c025de.tar.gz | |
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 32e0dfdb837..5164661b69a 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -271,7 +271,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), option_wait=1; } else - option_wait= ~0; + option_wait= ~(uint)0; break; case '?': case 'I': /* Info */ |