← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: kalebral at gmail
  • Date: 2011-02-04 17:01:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2145.
  • Revision ID: kalebral@gmail.com-20110204170143-stl04hnyaa3kq0to
remove remaining error numbers for tests, fail if test has error numbers

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
3522
3522
    }
3523
3523
    else
3524
3524
    {
3525
 
      long val;
3526
 
      char *start= p;
3527
 
      /* Check that the string passed to str2int only contain digits */
3528
 
      while (*p && p != end)
3529
 
      {
3530
 
        if (!my_isdigit(charset_info, *p))
3531
 
          die("Invalid argument to error: '%s' - "              \
3532
 
              "the errno may only consist of digits[0-9]",
3533
 
              command->first_argument);
3534
 
        p++;
3535
 
      }
3536
 
 
3537
 
      /* Convert the sting to int */
3538
 
      istringstream buff(start);
3539
 
      if ((buff >> val).fail())
3540
 
        die("Invalid argument to error: '%s'", command->first_argument);
3541
 
 
3542
 
      to->code.errnum= (uint32_t) val;
3543
 
      to->type= ERR_ERRNO;
 
3525
      die ("You must either use the SQLSTATE or built in drizzle error label, numbers are not accepted");
3544
3526
    }
3545
3527
    to++;
3546
3528
    count++;