Commit 79d1fc5d authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents 4780c88f aff6a36e

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ 
# endif

#endif



/* Use cygwin for --exec and --system before 5.0 */

#if MYSQL_VERSION_ID < 50000

#define USE_CYGWIN

#endif



#define MAX_VAR_NAME_LENGTH    256

#define MAX_COLUMNS            256

#define MAX_EMBEDDED_SERVER_ARGS 64

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ sub environment_setup () { 
  my $deb_version;

  if (  $opt_valgrind and -d $debug_libraries_path and

        (! -e '/etc/debian_version' or

         ($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or

	 ($deb_version= mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or

         $deb_version > 3.1 ) )

  {

    push(@ld_library_paths, $debug_libraries_path);