diff options
| author | unknown <dlenev@mockturtle.local> | 2006-09-14 23:53:35 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-09-14 23:53:35 +0400 |
| commit | f1e6d23944e48d8293d38acaccb91a423b1e6ac8 (patch) | |
| tree | a407ae8ad0f336c756ce35ff39da6ccfac735913 /sql/CMakeLists.txt | |
| parent | 6a490444a615b9fd8ee057f71c215175cd6eb4cc (diff) | |
| parent | 2d8bd8767527864e4b9b2328e3d9b8d4bf676e4a (diff) | |
| download | mariadb-git-f1e6d23944e48d8293d38acaccb91a423b1e6ac8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index a089278448c..8d97edd4652 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -50,7 +50,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.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 - rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_timed.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 partition_info.cc rpl_injector.cc sql_locale.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc |