diff options
| author | monty@mysql.com <> | 2004-05-19 05:09:41 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-19 05:09:41 +0300 |
| commit | 332f124bc62d2a63cfb566b50e2784c357ef6b8e (patch) | |
| tree | a30e034782b8d0fcd3a899a55b1af5a967f23adb /client | |
| parent | fdaf6d4221d4f91101276460c5645e08c5b28e2c (diff) | |
| parent | 21f1bca7894a6879c5e530b0663dd5b0540d296c (diff) | |
| download | mariadb-git-332f124bc62d2a63cfb566b50e2784c357ef6b8e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 | ||||
| -rw-r--r-- | client/mysqltest.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 14fb1e1f917..8cbaf241bec 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1239,7 +1239,6 @@ static void fix_history(String *final_command) static int not_in_history(const char *line) { HIST_ENTRY *oldhist = history_get(history_length); - int num; if (oldhist == 0) return 1; @@ -1589,7 +1588,6 @@ static int com_server_help(String *buffer __attribute__((unused)), const char *server_cmd= buffer->ptr(); char cmd_buf[100]; MYSQL_RES *result; - MYSQL_FIELD *fields; int error; if (help_arg[0] != '\'') @@ -1615,7 +1613,7 @@ static int com_server_help(String *buffer __attribute__((unused)), { unsigned int num_fields= mysql_num_fields(result); my_ulonglong num_rows= mysql_num_rows(result); - fields= mysql_fetch_fields(result); + mysql_fetch_fields(result); if (num_fields==3 && num_rows==1) { if (!(cur= mysql_fetch_row(result))) diff --git a/client/mysqltest.c b/client/mysqltest.c index 2cd395a02b8..303473ef558 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -109,7 +109,7 @@ MYSQL_MANAGER* manager=0; static char **default_argv; static const char *load_default_groups[]= { "mysqltest","client",0 }; -static char line_buffer[MAX_DELIMITER], *line_buffer_pos= line_buffer;; +static char line_buffer[MAX_DELIMITER], *line_buffer_pos= line_buffer; static FILE* file_stack[MAX_INCLUDE_DEPTH]; static FILE** cur_file; |