bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3150)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-cleanup/ based on revid:marc.alff@stripped

 3150 Marc Alff	2010-04-19 [merge]
      local merge

    modified:
      BUILD/choose_configure.sh
      mysql-test/suite/sys_vars/r/large_files_support_basic.result
=== modified file 'BUILD/choose_configure.sh'
--- a/BUILD/choose_configure.sh	2010-04-18 13:32:05 +0000
+++ b/BUILD/choose_configure.sh	2010-04-19 11:05:07 +0000
@@ -2,11 +2,6 @@
 # Choose whether to use autoconf created configure
 # of perl script that calls cmake.
 
-# # This is a temporary hack to build 5.5.3-m3:
-# # The "cmake" way still shows issues in our release build environment.
-# # Block it temporarily, but in a way that can easily be undone.
-# HAVE_CMAKE=no
-
 # Ensure cmake and perl are there
 cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
 perl --version >/dev/null 2>&1 || HAVE_CMAKE=no

=== modified file 'mysql-test/suite/sys_vars/r/large_files_support_basic.result'
--- a/mysql-test/suite/sys_vars/r/large_files_support_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/large_files_support_basic.result	2010-04-19 10:57:34 +0000
@@ -1,20 +1,20 @@
 select @@global.large_files_support;
 @@global.large_files_support
-0
+1
 select @@session.large_files_support;
 ERROR HY000: Variable 'large_files_support' is a GLOBAL variable
 show global variables like 'large_files_support';
 Variable_name	Value
-large_files_support	OFF
+large_files_support	ON
 show session variables like 'large_files_support';
 Variable_name	Value
-large_files_support	OFF
+large_files_support	ON
 select * from information_schema.global_variables where variable_name='large_files_support';
 VARIABLE_NAME	VARIABLE_VALUE
-LARGE_FILES_SUPPORT	OFF
+LARGE_FILES_SUPPORT	ON
 select * from information_schema.session_variables where variable_name='large_files_support';
 VARIABLE_NAME	VARIABLE_VALUE
-LARGE_FILES_SUPPORT	OFF
+LARGE_FILES_SUPPORT	ON
 set global large_files_support=1;
 ERROR HY000: Variable 'large_files_support' is a read only variable
 set session large_files_support=1;


Attachment: [text/bzr-bundle] bzr/[e-mail]