diff options
| author | unknown <kent@kent-amd64.(none)> | 2008-02-18 14:49:51 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2008-02-18 14:49:51 +0100 |
| commit | 5220bcfb591683a3ea09e1f2c0ed3883d1c007ec (patch) | |
| tree | b88e8d82315769d8e15f0c404c6b9df8951b2342 | |
| parent | 1fdbf275aadcbd7dd98a34c653a586890ceac7ac (diff) | |
| parent | 979738a431eb322be5a27e1f259e2d7fa42283dc (diff) | |
| download | mariadb-git-5220bcfb591683a3ea09e1f2c0ed3883d1c007ec.tar.gz | |
Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca
into mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release
libmysqld/CMakeLists.txt:
Auto merged
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index a5a5f484a95..b046fba6583 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -190,7 +190,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc - ../sql/sql_update.cc ../sql/sql_view.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/partition_info.cc ../sql/sql_connect.cc |