bzr push into mysql-6.0-bugteam branch (vvaintroub:3034 to 3035)

[Vladislav Vaintroub]

 3035 Vladislav Vaintroub	2009-02-09 [merge]
      merge bug42427 from 5.1-bugteam
modified:
  mysql-test/lib/mtr_unique.pm

 3034 Timothy Smith	2009-02-07 [merge]
      Auto-merge up from 5.1
modified:
  mysql-test/r/func_sapdb.result
  mysql-test/t/func_sapdb.test
  netware/Makefile.am
  scripts/make_binary_distribution.sh
  sql/item_timefunc.h

=== modified file 'mysql-test/lib/mtr_unique.pm'
--- a/mysql-test/lib/mtr_unique.pm	2008-08-22 17:03:15 +0000
+++ b/mysql-test/lib/mtr_unique.pm	2009-02-09 12:15:57 +0000
@@ -28,7 +28,17 @@ sub msg {
  # print "### unique($$) - ", join(" ", @_), "\n";
 }
 
-my $file= "/tmp/mysql-test-ports";
+my $file;
+
+if(!IS_WINDOWS)
+{
+  $file= "/tmp/mysql-test-ports";
+}
+else
+{
+  $file= $ENV{'TEMP'}."/mysql-test-ports";
+}
+  
 
 my %mtr_unique_ids;