bzr commit into mysql-5.6-next-mr branch (mats:2942) WL#5030

[Mats Kindahl]

#At file:///home/bzr/mkindahl/w4877-next-mr-wl4877/ based on revid:mats@stripped

 2942 Mats Kindahl	2010-01-26
      WL#5030: Splitting mysql_priv.h
      
      Renaming time.cc to sql_time.cc in CMake files as well.

    modified:
      libmysqld/CMakeLists.txt
      sql/CMakeLists.txt
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2009-12-01 19:07:18 +0000
+++ b/libmysqld/CMakeLists.txt	2010-01-26 22:34:45 +0000
@@ -129,7 +129,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
            ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
            ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc
            ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
-           ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
+           ../sql/sql_time.cc ../sql/tztime.cc ../sql/uniques.cc
+           ../sql/unireg.cc
            ../sql/partition_info.cc ../sql/sql_connect.cc 
            ../sql/scheduler.cc ../sql/event_parse_data.cc
            ../sql/sql_signal.cc ../sql/rpl_handler.cc

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2009-12-01 19:07:18 +0000
+++ b/sql/CMakeLists.txt	2010-01-26 22:34:45 +0000
@@ -68,7 +68,7 @@ SET (SQL_SOURCE
                sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc 
                sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
                sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc 
-               time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 
+               sql_time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 
                rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_data_objects.cc
                event_queue.cc event_db_repository.cc 
                sql_tablespace.cc events.cc ../sql-common/my_user.c 


Attachment: [text/bzr-bundle] bzr/[e-mail]