~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Stewart Smith
  • Date: 2009-01-30 06:16:09 UTC
  • mfrom: (813.3.4 for-brian)
  • mto: (859.1.1 nofrm)
  • mto: This revision was merged to the branch mainline in revision 822.
  • Revision ID: stewart@flamingspork.com-20090130061609-4ocqhq8qj08e4656
merge other work

Show diffs side-by-side

added added

removed removed

Lines of Context:
1450
1450
    dummy_share.table_name.length= strlen(alias);
1451
1451
    dummy_table.alias= alias;
1452
1452
 
1453
 
    handler *file= dtargs.file;
1454
 
    file->change_table_ptr(&dummy_table, &dummy_share);
1455
 
 
1456
 
    session->push_internal_handler(&ha_delete_table_error_handler);
1457
 
    file->print_error(dtargs.error, 0);
1458
 
 
1459
 
    session->pop_internal_handler();
 
1453
    if(dtargs.file)
 
1454
    {
 
1455
      handler *file= dtargs.file;
 
1456
      file->change_table_ptr(&dummy_table, &dummy_share);
 
1457
 
 
1458
      session->push_internal_handler(&ha_delete_table_error_handler);
 
1459
      file->print_error(dtargs.error, 0);
 
1460
 
 
1461
      session->pop_internal_handler();
 
1462
    }
 
1463
    else
 
1464
      dtargs.error= -1; /* General form of fail. maybe bad FRM */
1460
1465
 
1461
1466
    /*
1462
1467
      XXX: should we convert *all* errors to warnings here?