List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:March 23 2012 9:30am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3841 to 3842) Bug#13595996
View as plain text  
 3842 Tor Didriksen	2012-03-23
      Bug#13595996 CREATE A CONSISTENT DEVELOPMENT CMAKE OPTION SET AND MAKE IT A DEFAULT
      
      Add README. 
      Use 'make' rather than 'gmake' (which is not available on all platforms)
      The -j option may be set in the environment anyways.

    added:
      BUILD/README
    modified:
      BUILD/compile-pentium
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-gcov
      BUILD/compile-pentium-gprof
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64
 3841 Vasil Dimov	2012-03-22
      Fix Bug#13838962 STATISTICS CALCULATION SKIPS DELETE-MARKED RECORDS AND
      CAUSES ASSERTION FAILURE
      
      Do not skip delete marked records because if all the level contains only
      such records then dict_stats_analyze_index_level() will return that there
      are 0 records on that level and if the level is >0 the code will assert
      (only possible to have 0 records on some level if it is level 0 and the
      whole tree is empty). Another possible fix is to change the code to expect
      a return value of 0 for total number records and to act accordingly -
      knowing that the tree is empty.
      
      It is not clear why I added the skipping of delete-marked records in the
      following changeset which this patch reverts:
      
      * revision-id: vasil.dimov@stripped
      * committer: Vasil Dimov <vasil.dimov@stripped>
      * timestamp: Wed 2010-04-21 18:23:17 +0300
      * message:
      *   Ignore delete marked records when counting the distinct records.
      *
      *   If ANALYZE is run quickly after DELETE then purge may not have
      *   kicked yet and delete marked records may exist.
      
      Use TRUNCATE TABLE instead of DELETE FROM in the innodb_stats test because
      with this change ANALYZE immediately after truncate becomes
      non-deterministic - it is not clear how many delete-marked rows purge will
      have wiped away before ANALZYE.
      
      Approved by:	Marko (http://bur03.no.oracle.com/rb/r/993/)

    modified:
      mysql-test/suite/innodb/include/innodb_stats.inc
      mysql-test/suite/innodb/r/innodb_stats.result
      storage/innobase/dict/dict0stats.cc
=== added file 'BUILD/README'
--- a/BUILD/README	1970-01-01 00:00:00 +0000
+++ b/BUILD/README	2012-03-23 09:29:43 +0000
@@ -0,0 +1,38 @@
+This directory used to contain lots of build scripts for building
+MySQL on various platforms. They are mostly gone, use cmake instead.
+
+Some scripts have been kept for backward compatibility (other scripts
+depend on them). Others have been kept to illustrate how to enable
+gcov or gprof, or explicitly selecting 64bit architecture.  If you
+want to use these scripts for building, you may want to speed things
+up a bit by setting environment variable MAKEFLAGS="-j8"
+(or some other number/flag depending on your environment)
+
+The recommended way to build MySQL for developers:
+
+cd <some build directory>
+cmake <path to source directory>
+make
+
+This will give you a release build, with compiler options taken from
+../cmake/build_configurations/compiler_options.cmake
+and "feature set" taken from
+../cmake/build_configurations/feature_set.cmake
+
+Adding -DWITH_DEBUG=1 to the cmake command line gives you a debug build.
+
+
+Building on Windows is slightly different:
+cd <some build directory>
+cmake <path to source directonry>
+
+devenv MySQL.sln /build Debug
+or
+devenv MySQL.sln /build RelWithDebInfo
+
+
+If you have special needs, you can disable the defaults by setting
+these cmake variables off:
+
+WITH_DEFAULT_COMPILER_OPTIONS
+WITH_DEFAULT_FEATURE_SET

=== modified file 'BUILD/compile-pentium'
--- a/BUILD/compile-pentium	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-debug'
--- a/BUILD/compile-pentium-debug	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-debug	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-debug-max'
--- a/BUILD/compile-pentium-debug-max	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-debug-max	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-debug-max-no-ndb'
--- a/BUILD/compile-pentium-debug-max-no-ndb	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-debug-max-no-ndb	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DWITH_NDBCLUSTER=0
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-gcov'
--- a/BUILD/compile-pentium-gcov	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-gcov	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DENABLE_GCOV=ON 
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-gprof'
--- a/BUILD/compile-pentium-gprof	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-gprof	2012-03-23 09:29:43 +0000
@@ -17,4 +17,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0 -DENABLE_GPROF=ON 
-gmake -j 4
+make

=== modified file 'BUILD/compile-pentium-valgrind-max'
--- a/BUILD/compile-pentium-valgrind-max	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-valgrind-max	2012-03-23 09:29:43 +0000
@@ -19,5 +19,6 @@
 # -DHAVE_purify : activates misc. ifdefs in the source code
 
 path=`dirname $0`
-cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 -DCMAKE_CXX_FLAGS=-DHAVE_purify
-gmake -j 4
+cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \
+    -DCMAKE_C_FLAGS=-DHAVE_purify -DCMAKE_CXX_FLAGS=-DHAVE_purify
+make

=== modified file 'BUILD/compile-pentium-valgrind-max-no-ndb'
--- a/BUILD/compile-pentium-valgrind-max-no-ndb	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium-valgrind-max-no-ndb	2012-03-23 09:29:43 +0000
@@ -18,7 +18,7 @@
 # MA 02111-1307, USA
 
 path=`dirname $0`
-cmake $path/.. -DWITH_DEBUG=1 \
-     -DWITH_VALGRIND=1 -DCMAKE_CXX_FLAGS=-DHAVE_purify \
-     -DWITH_NDBCLUSTER=0
-gmake -j 4
+cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \
+    -DCMAKE_C_FLAGS=-DHAVE_purify -DCMAKE_CXX_FLAGS=-DHAVE_purify \
+    -DWITH_NDBCLUSTER=0
+make

=== modified file 'BUILD/compile-pentium64'
--- a/BUILD/compile-pentium64	2012-03-21 14:30:53 +0000
+++ b/BUILD/compile-pentium64	2012-03-23 09:29:43 +0000
@@ -19,4 +19,4 @@
 
 path=`dirname $0`
 cmake $path/.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64 
-gmake -j 4
+make

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3841 to 3842) Bug#13595996Tor Didriksen26 Mar