diff options
author | monty@mysql.com/nosik.monty.fi <> | 2007-08-13 16:11:25 +0300 |
---|---|---|
committer | monty@mysql.com/nosik.monty.fi <> | 2007-08-13 16:11:25 +0300 |
commit | e53a73e26cf858ac48ead40927d84d54e33c1695 (patch) | |
tree | a462885d0de8206ed3a0b18affdd892bafca84c8 /client/mysqladmin.cc | |
parent | 113cd2d064e500cd3241046ab374c490d95dace8 (diff) | |
download | mariadb-git-e53a73e26cf858ac48ead40927d84d54e33c1695.tar.gz |
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db
I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read() -> index_read_map()
index_read_idx() -> index_read_idx_map()
index_read_last() -> index_read_last_map()
Diffstat (limited to 'client/mysqladmin.cc')
-rw-r--r-- | client/mysqladmin.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index ce48ad03d33..91fb7386916 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -71,10 +71,12 @@ static uint ex_var_count, max_var_length, max_val_length; static void print_version(void); static void usage(void); +extern "C" my_bool get_one_option(int optid, const struct my_option *opt, + char *argument); static my_bool sql_connect(MYSQL *mysql, uint wait); static int execute_commands(MYSQL *mysql,int argc, char **argv); static int drop_db(MYSQL *mysql,const char *db); -static sig_handler endprog(int signal_number); +extern "C" sig_handler endprog(int signal_number); static void nice_time(ulong sec,char *buff); static void print_header(MYSQL_RES *result); static void print_top(MYSQL_RES *result); @@ -230,7 +232,7 @@ static struct my_option my_long_options[] = static const char *load_default_groups[]= { "mysqladmin","client",0 }; -static my_bool +my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { @@ -430,7 +432,7 @@ int main(int argc,char *argv[]) } -static sig_handler endprog(int signal_number __attribute__((unused))) +sig_handler endprog(int signal_number __attribute__((unused))) { interrupted=1; } |