diff options
| author | bell@sanja.is.com.ua <> | 2002-04-30 21:27:26 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2002-04-30 21:27:26 +0300 |
| commit | 4328a8cff0f8e36da4b4bd3c023e6db4d6a05d8a (patch) | |
| tree | 3795d5870fddf78f94ba3f45e6b36917f99761ce /client | |
| parent | ea459bc9508336ef84b1e356cf9fd358cf6cae6b (diff) | |
| parent | 7d276c3bb8298287cf17eb2a7c473106e291dc1a (diff) | |
| download | mariadb-git-4328a8cff0f8e36da4b4bd3c023e6db4d6a05d8a.tar.gz | |
ChangeLog merging
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlcheck.c | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 8 | ||||
| -rw-r--r-- | client/mysqltest.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 86507bc0b31..7945407ccae 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -614,8 +614,8 @@ int main(int argc, char **argv) if (dbConnect(current_host, current_user, opt_password)) exit(EX_MYSQLERR); - if (opt_auto_repair && - init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64)) + if (opt_auto_repair && + my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64)) { first_error = 1; goto end; diff --git a/client/mysqldump.c b/client/mysqldump.c index eae5700a553..7e05e777acd 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -35,7 +35,7 @@ ** and adapted to mysqldump 05/11/01 by Jani Tolonen */ -#define DUMP_VERSION "9.01" +#define DUMP_VERSION "9.02" #include <my_global.h> #include <my_sys.h> @@ -201,8 +201,7 @@ static struct my_option my_long_options[] = 0, 0}, {"result-file", 'r', "Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\n\\r' (newline + carriage return).", - (gptr*) &md_result_file, (gptr*) &md_result_file, 0, GET_STR, REQUIRED_ARG, - 0, 0, 0, 0, 0, 0}, + 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"socket", 'S', "Socket file to use for connection.", (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -366,9 +365,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), opt_xml = 1; opt_disable_keys=0; break; - default: - fprintf(stderr,"%s: Illegal option character '%c'\n",my_progname,opterr); - /* Fall throught */ case 'I': case '?': usage(); diff --git a/client/mysqltest.c b/client/mysqltest.c index a007c7778e0..a161b9352d4 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2360,7 +2360,7 @@ int main(int argc, char** argv) file_stack_end = file_stack + MAX_INCLUDE_DEPTH; cur_file = file_stack; lineno = lineno_stack; - init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES, + my_init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES, INIT_Q_LINES); memset(block_stack, 0, sizeof(block_stack)); block_stack_end = block_stack + BLOCK_STACK_DEPTH; |