summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-19 05:09:10 +0300
committermonty@mysql.com <>2004-05-19 05:09:10 +0300
commit21f1bca7894a6879c5e530b0663dd5b0540d296c (patch)
tree57ccf880c409f526096a1fbd30b165d14a22f473 /client/mysql.cc
parent3f5ce7bd25397efb7a56a2b1ee0d2c638c3cf3ef (diff)
downloadmariadb-git-21f1bca7894a6879c5e530b0663dd5b0540d296c.tar.gz
Portability fixes
Fixed wrong number of warnings/duplicates for machines with high-byte-first
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index cf80a5594e4..e58790e5232 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)))