← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Brian Aker
  • Date: 2010-03-26 06:54:35 UTC
  • mfrom: (1393.3.1 drizzle-bug-308381)
  • Revision ID: brian@gir.local-20100326065435-f99s3vr10jgqu18x
Merge Andrew

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1604
1604
}
1605
1605
 
1606
1606
 
1607
 
static bool get_one_option(int optid, const struct my_option *, char *argument)
 
1607
static int get_one_option(int optid, const struct my_option *, char *argument)
1608
1608
{
1609
1609
  char *endchar= NULL;
1610
1610
  uint64_t temp_drizzle_port= 0;
1629
1629
      {
1630
1630
        put_info(_("DELIMITER cannot contain a backslash character"),
1631
1631
                 INFO_ERROR,0,0);
1632
 
        return false;
 
1632
        return EXIT_ARGUMENT_INVALID;
1633
1633
      }
1634
1634
    }
1635
1635
    delimiter_length= (uint32_t)strlen(delimiter);
1704
1704
    if (strlen(endchar) != 0)
1705
1705
    {
1706
1706
      put_info(_("Non-integer value supplied for port.  If you are trying to enter a password please use --password instead."), INFO_ERROR, 0, 0);
1707
 
      return false;
 
1707
      return EXIT_ARGUMENT_INVALID;
1708
1708
    }
1709
1709
    /* If the port number is > 65535 it is not a valid port
1710
1710
       This also helps with potential data loss casting unsigned long to a
1712
1712
    if ((temp_drizzle_port == 0) || (temp_drizzle_port > 65535))
1713
1713
    {
1714
1714
      put_info(_("Value supplied for port is not valid."), INFO_ERROR, 0, 0);
1715
 
      return false;
 
1715
      return EXIT_ARGUMENT_INVALID;
1716
1716
    }
1717
1717
    else
1718
1718
    {