Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:

bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin 
bzr rm innobase # remove the builtin
Next step: build, test fixes.

1 files changed, 0 insertions, 26 deletions

diff --git a/storage/innobase/include/ut0vec.ic b/storage/innobase/include/ut0vec.ic
deleted file mode 100644
index 417a17d951f..00000000000
--- a/storage/innobase/include/ut0vec.ic
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************
-Get number of elements in vector. */
-UNIV_INLINE
-ulint
-ib_vector_size(
-/*===========*/
-				/* out: number of elements in vector */
-	ib_vector_t*	vec)	/* in: vector */
-{
-	return(vec->used);
-}
-
-/********************************************************************
-Get n'th element. */
-UNIV_INLINE
-void*
-ib_vector_get(
-/*==========*/
-				/* out: n'th element */
-	ib_vector_t*	vec,	/* in: vector */
-	ulint		n)	/* in: element index to get */
-{
-	ut_a(n < vec->used);
-
-	return(vec->data[n]);
-}