diff options
| author | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
| commit | d1c1dac8193053168032fe1792b014a51c0e7652 (patch) | |
| tree | 062459896af47cd55d827d7da71b11b4b43ce0c0 /sql/CMakeLists.txt | |
| parent | 39f1d9f411160beb20f367fec4d01f9721d7a513 (diff) | |
| download | mariadb-git-d1c1dac8193053168032fe1792b014a51c0e7652.tar.gz | |
Update to push all of merge into the merge storage directory.
storage/myisammrg/ha_myisammrg.h:
Rename: sql/ha_myisammrg.h -> storage/myisammrg/ha_myisammrg.h
storage/federated/CMakeLists.txt:
BitKeeper file /home/brian/mysql/arch-5.1/storage/federated/CMakeLists.txt
libmysqld/Makefile.am:
Removed mrg
sql/CMakeLists.txt:
Removed mrg
sql/Makefile.am:
Removed mrg
sql/handler.cc:
Removed mrg include (no longer needed)
sql/sql_cache.cc:
Updated include files
storage/heap/Makefile.am:
Formatting
storage/myisammrg/Makefile.am:
Updated makefile for mrg
storage/myisammrg/ha_myisammrg.cc:
Updated Makefile
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 7ec2f9fcd0f..ff1199bf0a9 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -27,7 +27,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc field_conv.cc - filesort.cc gstream.cc ha_myisam.cc ha_myisammrg.cc + filesort.cc gstream.cc ha_myisam.cc ha_innodb.cc ha_partition.cc handler.cc hash_filo.cc hash_filo.h hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc @@ -35,7 +35,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc item_uniq.cc key.cc log.cc lock.cc log_event.cc message.rc message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c - ../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc + mysqld.cc net_serv.cc nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc ../sql-common/pack.c parse_file.cc password.c procedure.cc protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc |