diff options
| author | unknown <ahristov@bk-internal.mysql.com> | 2006-09-06 14:35:27 +0200 |
|---|---|---|
| committer | unknown <ahristov@bk-internal.mysql.com> | 2006-09-06 14:35:27 +0200 |
| commit | 23a46f410fabb568f7746f8446eac1d38cdc2775 (patch) | |
| tree | cdf3e0dc82ad727eeb336674c00a94ea65e7566f /sql/CMakeLists.txt | |
| parent | d57163fcf84d6fc0e8cad5fdbbe5c14274eb694c (diff) | |
| parent | e22b6703f8061d572beb00ad0b5f0be1bb4f37cc (diff) | |
| download | mariadb-git-23a46f410fabb568f7746f8446eac1d38cdc2775.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/not_embedded_server.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
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 132362c43d1..636aa5dc70e 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 |