MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:svoj Date:October 1 2005 7:12am
Subject:bk commit into 5.0 tree (svoj:1.2004)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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.2004 05/10/01 12:12:39 svoj@stripped +2 -0
  Merge svoj@stripped:/bk/mysql-5.0-cnet
  into  mysql.com:/home/svoj/devel/mysql/CNET/merge/mysql-5.0

  libmysqld/Makefile.am
    1.64 05/10/01 12:12:34 svoj@stripped +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.211 05/10/01 12:12:27 svoj@stripped +1 -1
    auto-union

# 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:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/CNET/merge/mysql-5.0/RESYNC

--- 1.63/libmysqld/Makefile.am	2005-09-28 14:50:27 +05:00
+++ 1.64/libmysqld/Makefile.am	2005-10-01 12:12:34 +05:00
@@ -65,7 +65,7 @@
 	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
 	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
 	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
-	ha_blackhole.cc
+	ha_blackhole.cc sql_plugin.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
 libmysqld_a_SOURCES=

--- 1.210/BitKeeper/etc/ignore	2005-09-23 01:46:39 +05:00
+++ 1.211/BitKeeper/etc/ignore	2005-10-01 12:12:27 +05:00
@@ -495,6 +495,7 @@
 libmysqld/sql_map.cc
 libmysqld/sql_olap.cc
 libmysqld/sql_parse.cc
+libmysqld/sql_plugin.cc
 libmysqld/sql_prepare.cc
 libmysqld/sql_rename.cc
 libmysqld/sql_repl.cc
Thread
bk commit into 5.0 tree (svoj:1.2004)svoj1 Oct