diff options
| author | unknown <vvaintroub@wva.> | 2008-02-19 14:20:46 +0100 |
|---|---|---|
| committer | unknown <vvaintroub@wva.> | 2008-02-19 14:20:46 +0100 |
| commit | 13791914a55e943f359d8e1ba611cc0098586a36 (patch) | |
| tree | d689665c9e906732df02eff70adba9ca42fc459c /sql/CMakeLists.txt | |
| parent | 4bacd53715ac860c6ba2d9c148f87d22cae9c62a (diff) | |
| parent | 721d24124fee09a13da32cb49295fdfd45729592 (diff) | |
| download | mariadb-git-13791914a55e943f359d8e1ba611cc0098586a36.tar.gz | |
Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2
into wva.:C:/bk/bug31745_2/my51_31754_2
sql/CMakeLists.txt:
Auto merged
sql/stacktrace.c:
Auto merged
sql/sql_parse.cc:
merge.
sql/mysqld.cc:
merge
sql/stacktrace.h:
merge
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 1dffb6ffb58..82e3b2e32cb 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -43,7 +43,7 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN) ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc - discover.cc ../libmysql/errmsg.c field.cc field_conv.cc + discover.cc ../libmysql/errmsg.c field.cc stacktrace.c stacktrace.h field_conv.cc filesort.cc gstream.cc ha_partition.cc handler.cc hash_filo.cc hash_filo.h |