bzr push into mysql-trunk branch (magne.mahre:3310 to 3311)

[Magne Mahre]

 3311 Magne Mahre	2011-04-14 [merge]
      Merge from 5.5.  No conflicts

    modified:
      cmake/os/Windows.cmake
      config.h.cmake
 3310 Anitha Gopi	2011-04-14
      Add big-test option to weekend run of all suites

    modified:
      mysql-test/collections/default.weekly
=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2010-11-19 23:41:00 +0000
+++ b/cmake/os/Windows.cmake	2011-04-14 08:09:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Sun Microsystems, Inc
+# Copyright (C) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -191,3 +191,4 @@ IF(NOT HAVE_SIZE_OF_SSIZE_T)
 ENDIF()
 
 SET(FN_NO_CASE_SENSE 1)
+SET(USE_SYMDIR 1)

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2011-04-13 19:16:45 +0000
+++ b/config.h.cmake	2011-04-14 08:09:49 +0000
@@ -509,6 +509,7 @@
 #cmakedefine EXTRA_DEBUG 1
 #cmakedefine BACKUP_TEST 1
 #cmakedefine CYBOZU 1
+#cmakedefine USE_SYMDIR 1
 
 /* Character sets and collations */
 #cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"

No bundle (reason: useless for push emails).