Below is the list of changes that have just been committed into a local
5.1 repository of baker. When baker 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@stripped, 2007-01-04 19:54:52+01:00, baker@stripped +2 -0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
MERGE: 1.2368.1.3
storage/csv/CMakeLists.txt@stripped, 2007-01-04 19:54:46+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.5.1.1
storage/csv/Makefile.am@stripped, 2007-01-04 19:54:46+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.10.1.1
# 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: baker
# Host: bk-internal.mysql.com
# Root: /data0/bk/mysql-5.1-arch/RESYNC
--- 1.12/storage/csv/Makefile.am 2007-01-04 19:54:59 +01:00
+++ 1.13/storage/csv/Makefile.am 2007-01-04 19:54:59 +01:00
@@ -27,18 +27,18 @@
LDADD =
DEFS = @DEFS@
-noinst_HEADERS = ha_tina.h
+noinst_HEADERS = ha_tina.h transparent_file.h
EXTRA_LTLIBRARIES = ha_csv.la
pkglib_LTLIBRARIES = @plugin_csv_shared_target@
ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN
-ha_csv_la_SOURCES = ha_tina.cc
+ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_LIBRARIES = libcsv.a
noinst_LIBRARIES = @plugin_csv_static_target@
libcsv_a_CXXFLAGS = $(AM_CFLAGS)
-libcsv_a_SOURCES = ha_tina.cc
+libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
--- 1.6/storage/csv/CMakeLists.txt 2007-01-04 19:54:59 +01:00
+++ 1.7/storage/csv/CMakeLists.txt 2007-01-04 19:54:59 +01:00
@@ -19,4 +19,4 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/extra/yassl/include)
-ADD_LIBRARY(csv ha_tina.cc ha_tina.h)
+ADD_LIBRARY(csv ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
| Thread |
|---|
| • bk commit into 5.1 tree (baker:1.2375) | Brian Aker | 4 Jan |
