diff options
| author | unknown <konstantin@mysql.com> | 2006-06-26 18:45:46 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-06-26 18:45:46 +0400 |
| commit | fee803af179a3adc89f5e87511489bf44df527dd (patch) | |
| tree | 83857837ef8ba671f8533131cf5fb0bdbe65f750 /sql/CMakeLists.txt | |
| parent | a5e194ed526f6974bddc9e847f13d6a431e30b37 (diff) | |
| parent | 42169376f04a575fc5b21d8c57974493a6444d5e (diff) | |
| download | mariadb-git-fee803af179a3adc89f5e87511489bf44df527dd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/opt/local/work/mysql-5.1-runtime
mysql-test/r/information_schema.result:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/events.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/events_microsec.test:
SCCS merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index fe6c54b2391..9a97b79813b 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -52,7 +52,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.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 - sql_tablespace.cc event.cc ../sql-common/my_user.c + sql_tablespace.cc events.cc ../sql-common/my_user.c partition_info.cc rpl_injector.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h |