diff options
| author | unknown <andrey@lmy004.> | 2006-06-28 15:54:09 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-06-28 15:54:09 +0200 |
| commit | 98211beaee1cffd0ecf28a2157fbb0de3692cc3e (patch) | |
| tree | eca43a35436b43e490c1554f13bbcd02616e7fa2 /sql/CMakeLists.txt | |
| parent | 57f3f2568ee27b30f0062b0175faf9f0a1a854e1 (diff) | |
| parent | 400276c2f577f63ffd3871a91bce207f65d5e682 (diff) | |
| download | mariadb-git-98211beaee1cffd0ecf28a2157fbb0de3692cc3e.tar.gz | |
Merge
sql/CMakeLists.txt:
Auto merged
sql/events.cc:
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.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_show.cc:
SCCS 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 9a97b79813b..58f3fb4409e 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -51,7 +51,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 ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc |