From: vasil.dimov
Date: September 30 2011 3:58pm
Subject: bzr push into mysql-trunk branch (vasil.dimov:3463 to 3465)
List-Archive: http://lists.mysql.com/commits/141250
Message-Id: <20110930155851.26BA62E0BE@mail.v5d.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3465 Vasil Dimov	2011-09-30
      Do not skip InnoDB during install step on Windows.
      
      Submitted by:	Daniel Fischer

    modified:
      cmake/create_initial_db.cmake.in
 3464 Vasil Dimov	2011-09-29
      Use btr_cur_get_index(cur) instead of cur->index

    modified:
      storage/innobase/dict/dict0stats.c
 3463 Bjorn Munch	2011-09-30 [merge]
      upmerge 12956584 followup fix

    modified:
      client/mysqltest.cc
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	revid:bjorn.munch@stripped
+++ b/cmake/create_initial_db.cmake.in	revid:vasil.dimov@stripped
@@ -59,7 +59,6 @@ SET(BOOTSTRAP_COMMAND 
   --datadir=.
   --default-storage-engine=MyISAM
   --default-tmp-storage-engine=MyISAM
-  --loose-skip-innodb
   --loose-skip-ndbcluster
   --max_allowed_packet=8M
   --net_buffer_length=16K

=== modified file 'storage/innobase/dict/dict0stats.c'
--- a/storage/innobase/dict/dict0stats.c	revid:bjorn.munch@stripped
+++ b/storage/innobase/dict/dict0stats.c	revid:vasil.dimov@stripped
@@ -786,7 +786,7 @@ dict_stats_analyze_index_below_cur(
 	ib_uint64_t	n_diff; /* the result */
 	ulint		size;
 
-	index = cur->index;
+	index = btr_cur_get_index(cur);
 
 	/* Allocate offsets for the record and the node pointer, for
 	node pointer records. In a secondary index, the node pointer

No bundle (reason: useless for push emails).