← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2011-01-24 06:00:51 UTC
  • mfrom: (2107.1.3 drizzle-build)
  • Revision ID: brian@tangent.org-20110124060051-o8qvrxgw4nwc94nr
Merge in error message number.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
843
843
 
844
844
static void handle_command_error(struct st_command *command, uint32_t error)
845
845
{
846
 
 
847
846
  if (error != 0)
848
847
  {
849
848
    uint32_t i;
870
869
        command->first_word_len, command->query,
871
870
        command->expected_errors.err[0].code.errnum);
872
871
  }
873
 
  return;
874
872
}
875
873
 
876
874
 
2480
2478
 
2481
2479
  error= internal::my_delete(ds_filename.c_str(), MYF(0)) != 0;
2482
2480
  handle_command_error(command, error);
2483
 
  return;
2484
2481
}
2485
2482
 
2486
2483
 
2515
2512
  error= (internal::my_copy(ds_from_file.c_str(), ds_to_file.c_str(),
2516
2513
                  MYF(MY_DONT_OVERWRITE_FILE)) != 0);
2517
2514
  handle_command_error(command, error);
2518
 
  return;
2519
2515
}
2520
2516
 
2521
2517
 
2553
2549
    die("You must write a 4 digit octal number for mode");
2554
2550
 
2555
2551
  handle_command_error(command, chmod(ds_file.c_str(), mode));
2556
 
  return;
2557
2552
}
2558
2553
 
2559
2554
 
2583
2578
 
2584
2579
  error= (access(ds_filename.c_str(), F_OK) != 0);
2585
2580
  handle_command_error(command, error);
2586
 
  return;
2587
2581
}
2588
2582
 
2589
2583
 
2612
2606
 
2613
2607
  error= mkdir(ds_dirname.c_str(), (0777 & internal::my_umask_dir)) != 0;
2614
2608
  handle_command_error(command, error);
2615
 
  return;
2616
2609
}
2617
2610
 
2618
2611
/*
2640
2633
 
2641
2634
  error= rmdir(ds_dirname.c_str()) != 0;
2642
2635
  handle_command_error(command, error);
2643
 
  return;
2644
2636
}
2645
2637
 
2646
2638
 
2879
2871
  }
2880
2872
 
2881
2873
  handle_command_error(command, error);
2882
 
  return;
2883
2874
}
2884
2875
 
2885
2876
 
2929
2920
 
2930
2921
  if (drizzle_quit(&con->con,&result, &ret))
2931
2922
    drizzle_result_free(&result);
2932
 
 
2933
 
  return;
2934
2923
}
2935
2924
 
2936
2925
 
3027
3016
  internal::my_delete(temp_file_path, MYF(0));
3028
3017
 
3029
3018
  handle_command_error(command, WEXITSTATUS(error));
3030
 
  return;
3031
3019
}
3032
3020
 
3033
3021