Commit b1e51212 authored by unknown's avatar unknown
Browse files

Merge query_cache tests 


Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge test
parents 5aed4129 81647853

Build-tools/Do-compile

+3 −3
Original line number Diff line number Diff line
@@ -394,13 +394,13 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
  info("Running test suite");

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

  safe_cd("${test_dir}/mysql-test");

  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");



  unless ($opt_skip_ps_test)

  {

    log_timestamp();

    info("Running test suite using prepared statements");

    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");

  }

  

  unless ($opt_skip_embedded_test)
@@ -409,7 +409,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
    info("Running embedded server test suite");

    # Embedded server and NDB don't jive

    $flags=~ s/ --with-ndbcluster//;

    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");

  }

  # 'mysql-test-run' writes its own final message for log evaluation.

}

Build-tools/Do-solaris-pkg

+14 −14
Original line number Diff line number Diff line
@@ -14,19 +14,17 @@ $pkginfo = "pkginfo"; 
($gid ,$pkg ,$uid ,$userInfo ,$email ,$quota ,$group ,$passwd

,$category ,$userHome ,$vendor ,$loginShell ,$pstamp ,$basedir)=();



$fullname = shift @ARGV;

$fullname or die "No package name was specified";

-d $fullname or die "That directory is not present!";

$tarball= $fullname= shift @ARGV;

$fullname=~ s/.*(mysql.*)\.tar\.gz/$1/;

$workdir= $$; 

chomp ($parent_workdir= `pwd`);



$fullname =~ s,/+$,,;             # Remove ending slash if any

$hostname= ($fullname=~ m/^.+-64bit$/) ? $hostname . "-64bit" : $hostname;

$pkgdir= "$ENV{'HOME'}/$hostname";



$pkgdir= `cd ../$hostname; pwd`;

$pwd = `pwd`;

if ($pwd =~ '\/usr\/local') {

        $pwd = $`;

}

die  "Wrong location, please cd to <PKGBASE>/usr/local/ and run again.\n"

    	if ($pwd eq "");

mkdir $workdir or die "Can't make workdir: $!\n";

chdir $workdir or die "Can't change to workdir: $!\n";

system ("tar xzvf $tarball") == 0 or die "Can't untar: $!\n";



system  ("$find . -print | $pkgproto > $temp");

open (PREPROTO,"<$temp") or die "Unable to read prototype information ($!)\n";
@@ -57,8 +55,9 @@ unlink $temp or warn "Unable to remove tempfile ($!)\n"; 
# Now we can start building the package

#

# First get some info

$fullname =~ s,/+$,,;             # Remove ending slash if any



$fullname =~ /^((mysql)-.+)-([\d\.]+)-.+$/

$fullname =~ /^((mysql)-\w+-?\w+?)-([\d\.]+\w?)-.+$/

  or die "This name is not what I expected - \"$fullname\"";



$default{"name"}= $2;
@@ -137,10 +136,11 @@ system ("gzip /tmp/$packagename"); 
# Clean-up the spool area

system ("(cd /var/spool/pkg; rm -rf $pkg)");

# Clean-up the ~/packaging/ area

system ("(rm -rf mysql*)");

unlink $pkginfo;

unlink $prototype;

system ("mv /tmp/${packagename}.gz $pkgdir");

chdir $parent_workdir or die "Can't change to parent workdir '$parent_workdir': $!\n";

system ("rm -rf $workdir") == 0 or die "Can't remove the working dir: $!\n";

system ("mv /tmp/${packagename}.gz $pkgdir") == 0 or die "Can't move the finished package out of /tmp: $!\n";

print "Done. (~/$hostname/$packagename.gz)\n";

# The subroutines

sub chkvar {

VC++Files/tests/mysql_client_test.dsp

+5 −5
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 



!ELSEIF  "$(CFG)" == "mysql_client_test - Win32 Release"
@@ -76,8 +76,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF
@@ -87,7 +87,7 @@ LINK32=link.exe 
# Name "mysql_client_test - Win32 Release"

# Begin Source File



SOURCE=tests\mysql_client_test.c

SOURCE=mysql_client_test.c

# End Source File

# End Target

# End Project

VC++Files/tests/mysql_client_test_ia64.dsp

+3 −3
Original line number Diff line number Diff line
@@ -48,16 +48,16 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\tests\mysql_client_test.exe" /machine:IA64

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\mysql_client_test.exe" /machine:IA64

# SUBTRACT BASE LINK32 /pdb:none

# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib /out:"..\tests\mysql_client_test.exe" /machine:IA64 /machine:IA64

# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib /out:"..\mysql_client_test.exe" /machine:IA64 /machine:IA64

# SUBTRACT LINK32 /pdb:none

# Begin Target



# Name "mysql_client_test - WinIA64 Release"

# Begin Source File



SOURCE=tests\mysql_client_test.c

SOURCE=mysql_client_test.c

DEP_CPP_MYSQL=\

	"..\include\config-netware.h"\

	"..\include\config-os2.h"\

mysql-test/lib/mtr_report.pl

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ sub mtr_report_stats ($) { 
  {

    my $ratio=  $tot_passed * 100 / $tot_tests;

    printf "Failed $tot_failed/$tot_tests tests, " .

      "%.2f\% successful.\n\n", $ratio;

      "%.2f\% were successful.\n\n", $ratio;

    print

      "The log files in var/log may give you some hint\n",

      "of what when wrong.\n",