← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Monty Taylor
  • Date: 2009-01-28 04:37:46 UTC
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 816.
  • Revision ID: mordred@inaugust.com-20090128043746-d2yukekishwn3ftm
Turned on -Wshadow.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
1410
1410
  /* the variable name should not be longer than 64 characters */
1411
1411
  char name_buffer[64];
1412
1412
  int len;
1413
 
  LEX_STRING null_lex_str;
1414
1413
  SHOW_VAR tmp, *var;
1415
1414
 
1416
 
  null_lex_str.str= 0;                          // For sys_var->value_ptr()
1417
 
  null_lex_str.length= 0;
1418
 
 
1419
1415
  prefix_end= strncpy(name_buffer, prefix, sizeof(name_buffer)-1);
1420
1416
  prefix_end+= strlen(prefix);
1421
1417
 
1455
1451
        if (show_type == SHOW_SYS)
1456
1452
        {
1457
1453
          show_type= ((sys_var*) value)->show_type();
1458
 
          value=     (char*) ((sys_var*) value)->value_ptr(session, value_type,
1459
 
                                                           &null_lex_str);
 
1454
          value= (char*) ((sys_var*) value)->value_ptr(session, value_type,
 
1455
                                                       &null_lex_str);
1460
1456
        }
1461
1457
 
1462
1458
        pos= end= buff;
1509
1505
          break;
1510
1506
        case SHOW_HAVE:
1511
1507
        {
1512
 
          SHOW_COMP_OPTION tmp= *(SHOW_COMP_OPTION*) value;
1513
 
          pos= show_comp_option_name[(int) tmp];
 
1508
          SHOW_COMP_OPTION tmp_option= *(SHOW_COMP_OPTION *)value;
 
1509
          pos= show_comp_option_name[(int) tmp_option];
1514
1510
          end= strchr(pos, '\0');
1515
1511
          break;
1516
1512
        }
2547
2543
                continue;
2548
2544
            }
2549
2545
 
2550
 
            int res;
2551
2546
            LEX_STRING tmp_lex_string, orig_db_name;
2552
2547
            /*
2553
2548
              Set the parent lex of 'sel' because it is needed by