List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:January 19 2006 7:35pm
Subject:bk commit into 5.1 tree (jimw:1.2081)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2081 06/01/19 11:34:53 jimw@stripped +1 -0
  Merge bk-internal:/home/bk/mysql-5.2
  into  mysql.com:/home/jimw/my/mysql-5.2-clean

  configure.in
    1.332 06/01/19 11:34:49 jimw@stripped +0 -1
    Resolve conflict

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.2-clean/RESYNC

--- 1.331/configure.in	2006-01-06 06:22:44 -08:00
+++ 1.332/configure.in	2006-01-19 11:34:49 -08:00
@@ -15,12 +15,6 @@
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_VERSION=15:0:0
 
-# ndb version
-NDB_VERSION_MAJOR=5
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=19
-NDB_VERSION_STATUS=""
-
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -2443,7 +2437,8 @@
  \$(top_builddir)/storage/archive/libarchive.a, [
   AC_CONFIG_FILES(storage/archive/Makefile)
 ])
-MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[
+MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,
+  ../storage/csv/ha_tina.o,,[
   AC_CONFIG_FILES(storage/csv/Makefile)
 ])
 MYSQL_STORAGE_ENGINE(blackhole)
Thread
bk commit into 5.1 tree (jimw:1.2081)Jim Winstead19 Jan