← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Monty Taylor
  • Date: 2008-07-16 19:27:24 UTC
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: monty@inaugust.com-20080716192724-4wecmbs7ik59j90n
Fixed two small merge errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
1244
1244
  $exe_drizzlecheck= mtr_exe_exists("$path_client_bindir/drizzlecheck");
1245
1245
  $exe_drizzledump= mtr_exe_exists("$path_client_bindir/drizzledump");
1246
1246
  $exe_drizzleimport= mtr_exe_exists("$path_client_bindir/drizzleimport");
1247
 
  $exe_drizzlebinlog= mtr_exe_exists("$glob_basedir/server/binlog/drizzlebinlog");
 
1247
  $exe_drizzlebinlog= mtr_exe_exists("$path_client_bindir/drizzlebinlog");
1248
1248
  $exe_drizzleadmin= mtr_exe_exists("$path_client_bindir/drizzleadmin");
1249
1249
  $exe_drizzle=          mtr_exe_exists("$path_client_bindir/drizzle");
1250
1250