bk commit into 5.1 tree (kostja:1.2274)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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, 2006-07-28 16:37:16+04:00, kostja@stripped +2 -0
  Add sql_locale.cc to cmake scripts.

  libmysqld/CMakeLists.txt@stripped, 2006-07-28 16:37:13+04:00, kostja@stripped +3 -2
    Add sql_locale.cc to cmake scripts.

  sql/CMakeLists.txt@stripped, 2006-07-28 16:37:13+04:00, kostja@stripped +1 -1
    Add sql_locale.cc to cmake scripts.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge

--- 1.7/libmysqld/CMakeLists.txt	2006-07-28 16:37:25 +04:00
+++ 1.8/libmysqld/CMakeLists.txt	2006-07-28 16:37:25 +04:00
@@ -61,8 +61,9 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libm
             ../sql/sql_update.cc ../sql/sql_view.cc 
             ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
             ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
-            ../sql/partition_info.cc ../vio/vio.c
-            ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c
+            ../sql/partition_info.cc ../sql/sql_locale.cc
+            ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
+            ../vio/viosslfactories.c
             ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
             ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
 

--- 1.23/sql/CMakeLists.txt	2006-07-28 16:37:25 +04:00
+++ 1.24/sql/CMakeLists.txt	2006-07-28 16:37:25 +04:00
@@ -53,7 +53,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/clie
                time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 
                rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_timed.cc 
                sql_tablespace.cc events.cc ../sql-common/my_user.c 
-               partition_info.cc rpl_injector.cc
+               partition_info.cc rpl_injector.cc sql_locale.cc
                ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
   			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
 			   ${PROJECT_SOURCE_DIR}/include/mysqld_error.h