Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
cc2a2173
Commit
cc2a2173
authored
May 12, 2008
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-bugteam
into magare.gmz:/home/kgeorge/mysql/work/fixes-5.1-bugteam
parents
459a35cc
f1ad66e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+2
-4
sql/CMakeLists.txt
sql/CMakeLists.txt
+2
-2
No files found.
libmysqld/CMakeLists.txt
View file @
cc2a2173
...
...
@@ -147,14 +147,12 @@ ENDIF(WITH_CSV_STORAGE_ENGINE)
SET
(
SOURCE_SUBLIBS FALSE
)
SET
(
LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
SET
(
LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
event_parse_data.cc
../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
../sql-common/client.c ../sql-common/my_time.c
../sql-common/my_user.c ../sql-common/pack.c
../sql/password.c ../sql/discover.cc ../sql/derror.cc
../sql/event_scheduler.cc ../sql/events.cc
../sql/event_data_objects.cc ../sql/event_queue.cc
../sql/event_db_repository.cc ../sql/field.cc ../sql/field_conv.cc
../sql/field.cc ../sql/field_conv.cc
../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc
../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc
../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc
...
...
sql/CMakeLists.txt
View file @
cc2a2173
...
...
@@ -39,7 +39,7 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
${
PROJECT_SOURCE_DIR
}
/include/sql_state.h
PROPERTIES GENERATED 1
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN
-DHAVE_EVENT_SCHEDULER
)
ADD_EXECUTABLE
(
mysqld
../sql-common/client.c derror.cc des_key_file.cc
...
...
@@ -75,7 +75,7 @@ ADD_EXECUTABLE(mysqld
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
rpl_rli.cc rpl_mi.cc sql_servers.cc
sql_connect.cc scheduler.cc
sql_profile.cc
sql_profile.cc
event_parse_data.cc
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment