← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysql.cc

  • Committer: Brian Aker
  • Date: 2008-07-11 16:46:57 UTC
  • Revision ID: brian@tangent.org-20080711164657-45weklayjvmpbr2u
Cleanup of warning/errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysql.cc
1893
1893
  for (uint i= 0; commands[i].name; i++)
1894
1894
  {
1895
1895
    if (commands[i].func &&
1896
 
        ((name &&
1897
 
          !my_strnncoll(charset_info,(uchar*)name,len,
1898
 
                                     (uchar*)commands[i].name,len) &&
1899
 
          !commands[i].name[len] &&
1900
 
          (!end || (end && commands[i].takes_params))) ||
1901
 
         !name && commands[i].cmd_char == cmd_char))
 
1896
        ((name && !my_strnncoll(charset_info,(uchar*)name,len, (uchar*)commands[i].name,len) && !commands[i].name[len] && (!end || (end && commands[i].takes_params))) || (!name && commands[i].cmd_char == cmd_char)))
1902
1897
    {
1903
1898
      DBUG_PRINT("exit",("found command: %s", commands[i].name));
1904
1899
      DBUG_RETURN(&commands[i]);
2087
2082
      buffer.length(0);
2088
2083
    }
2089
2084
    else if (!*ml_comment && (!*in_string && (inchar == '#' ||
2090
 
                              inchar == '-' && pos[1] == '-' &&
2091
 
                              my_isspace(charset_info,pos[2]))))
 
2085
                              (inchar == '-' && pos[1] == '-' && my_isspace(charset_info,pos[2])))))
2092
2086
    {
2093
2087
      // Flush previously accepted characters
2094
2088
      if (out != line)
3428
3422
    messages.  To be safe, skip printing the duplicate only if it is the only
3429
3423
    warning.
3430
3424
  */
3431
 
  if (!cur || num_rows == 1 && error == (uint) strtoul(cur[1], NULL, 10))
 
3425
  if (!cur || (num_rows == 1 && error == (uint) strtoul(cur[1], NULL, 10)))
3432
3426
    goto end;
3433
3427
 
3434
3428
  /* Print the warnings */