Commit graph

8 commits

Author SHA1 Message Date
unknown
cd06644394 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
libmysqld/CMakeLists.txt:
  Fix for build for BDB
mysys/base64.c:
  Removed warning
mysys/my_pread.c:
  Removed warning
sql-common/my_time.c:
  Removed Warning
sql/CMakeLists.txt:
  Editing for BDB
storage/csv/ha_tina.cc:
  Removed warning
storage/myisam/ft_parser.c:
  Removed warning
storage/myisam/mi_delete_all.c:
  Removed unused variable
storage/myisam/mi_packrec.c:
  Removed unused variable
win/README:
  Fixed docs on Windows BDB
win/configure.js:
  Removed function call to add support for building BDB
2006-08-14 14:45:48 -07:00
unknown
bcc3b17ff5 Removed bdb test cases.
BitKeeper/deleted/.del-bdb-alter-table-1.result:
  Rename: mysql-test/r/bdb-alter-table-1.result -> BitKeeper/deleted/.del-bdb-alter-table-1.result
BitKeeper/deleted/.del-bdb-alter-table-1.test:
  Rename: mysql-test/t/bdb-alter-table-1.test -> BitKeeper/deleted/.del-bdb-alter-table-1.test
BitKeeper/deleted/.del-bdb-alter-table-2-master.opt:
  Rename: mysql-test/t/bdb-alter-table-2-master.opt -> BitKeeper/deleted/.del-bdb-alter-table-2-master.opt
BitKeeper/deleted/.del-bdb-alter-table-2.result:
  Rename: mysql-test/r/bdb-alter-table-2.result -> BitKeeper/deleted/.del-bdb-alter-table-2.result
BitKeeper/deleted/.del-bdb-alter-table-2.test:
  Rename: mysql-test/t/bdb-alter-table-2.test -> BitKeeper/deleted/.del-bdb-alter-table-2.test
BitKeeper/deleted/.del-bdb-crash.result:
  Rename: mysql-test/r/bdb-crash.result -> BitKeeper/deleted/.del-bdb-crash.result
BitKeeper/deleted/.del-bdb-crash.test:
  Rename: mysql-test/t/bdb-crash.test -> BitKeeper/deleted/.del-bdb-crash.test
BitKeeper/deleted/.del-bdb-deadlock.result:
  Rename: mysql-test/r/bdb-deadlock.result -> BitKeeper/deleted/.del-bdb-deadlock.result
BitKeeper/deleted/.del-bdb-deadlock.test:
  Rename: mysql-test/t/bdb-deadlock.test -> BitKeeper/deleted/.del-bdb-deadlock.test
BitKeeper/deleted/.del-bdb-deadlock.tminus:
  Rename: mysql-test/t/bdb-deadlock.tminus -> BitKeeper/deleted/.del-bdb-deadlock.tminus
BitKeeper/deleted/.del-bdb.result:
  Rename: mysql-test/r/bdb.result -> BitKeeper/deleted/.del-bdb.result
BitKeeper/deleted/.del-bdb.test:
  Rename: mysql-test/t/bdb.test -> BitKeeper/deleted/.del-bdb.test
BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631:
  Rename: mysql-test/t/bdb_cache-master.opt -> BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631
BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66:
  Rename: mysql-test/r/bdb_cache.result -> BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66
BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598:
  Rename: mysql-test/t/bdb_cache.test -> BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598
BitKeeper/deleted/.del-bdb_gis.result:
  Rename: mysql-test/r/bdb_gis.result -> BitKeeper/deleted/.del-bdb_gis.result
BitKeeper/deleted/.del-bdb_gis.test:
  Rename: mysql-test/t/bdb_gis.test -> BitKeeper/deleted/.del-bdb_gis.test
BitKeeper/deleted/.del-have_bdb.inc:
  Rename: mysql-test/include/have_bdb.inc -> BitKeeper/deleted/.del-have_bdb.inc
BitKeeper/deleted/.del-have_bdb.require:
  Rename: mysql-test/r/have_bdb.require -> BitKeeper/deleted/.del-have_bdb.require
BitKeeper/deleted/.del-index_merge_bdb.result:
  Rename: mysql-test/r/index_merge_bdb.result -> BitKeeper/deleted/.del-index_merge_bdb.result
BitKeeper/deleted/.del-index_merge_bdb.test:
  Rename: mysql-test/t/index_merge_bdb.test -> BitKeeper/deleted/.del-index_merge_bdb.test
BitKeeper/deleted/.del-ps_6bdb.result:
  Rename: mysql-test/r/ps_6bdb.result -> BitKeeper/deleted/.del-ps_6bdb.result
BitKeeper/deleted/.del-ps_6bdb.test:
  Rename: mysql-test/t/ps_6bdb.test -> BitKeeper/deleted/.del-ps_6bdb.test
BitKeeper/deleted/.del-rowid_order_bdb.result:
  Rename: mysql-test/r/rowid_order_bdb.result -> BitKeeper/deleted/.del-rowid_order_bdb.result
BitKeeper/deleted/.del-rowid_order_bdb.test:
  Rename: mysql-test/t/rowid_order_bdb.test -> BitKeeper/deleted/.del-rowid_order_bdb.test
BitKeeper/deleted/.del-sql_manager.h:
  Rename: sql/sql_manager.h -> BitKeeper/deleted/.del-sql_manager.h
libmysqld/Makefile.am:
  Removed bdb from the engine
mysql-test/extra/binlog_tests/binlog.test:
  Removed bdb support
mysql-test/r/binlog_stm_binlog.result:
  Updated results
mysql-test/r/ctype_utf8.result:
  Removed bdb support
mysql-test/t/ctype_utf8.test:
  Removed bdb support
sql/CMakeLists.txt:
  Removed file for Windows build
sql/Makefile.am:
  Removed unneeded include file.
sql/sql_manager.cc:
  Removed include file.
2006-08-10 18:29:25 -07:00
unknown
8ed51c9249 Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
unknown
fee803af17 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
2006-06-26 18:45:46 +04:00
unknown
52914641a4 Build fixes for Windows, Solaris, HPUX, AIX.
include/mysql/plugin.h:
  Fix compilation on non-GCC compilers.
sql/CMakeLists.txt:
  Add missing file.
2006-06-24 07:45:23 +02:00
unknown
99438424ac Reorganize, physically the events code
Unify method naming -> create/update/drop_event
Move class Event_timed to event_timed.h
class Events is in events.h (renamed from event.h)
The implementation is in events.cc (renamed from event.h)


BitKeeper/deleted/.del-event_executor.cc~f4a4645b973838ab:
  Delete: sql/event_executor.cc
include/my_time.h:
  add a boundary
libmysqld/CMakeLists.txt:
  event.cc -> events.cc
libmysqld/Makefile.am:
  event.cc -> event.cc
sql/CMakeLists.txt:
  event.cc -> events.cc
sql/Makefile.am:
  event.cc -> events.cc
  event_priv.h -> events_priv.h
sql/event_scheduler.cc:
  event.h -> events.h
  add_event -> create_event
  replace_event -> update_event()
  event_timed_compare_q is only used in event_scheduler.cc , so moving it
  from event.cc and making it static
sql/event_scheduler.h:
  add_event -> create_event
  replace_event -> update_event
sql/event_timed.cc:
  moved extern interval_type_to_name to mysql_priv.h
sql/mysql_priv.h:
  moved my_time_compare to time.cc
sql/mysqld.cc:
  event.h -> events.h
sql/sql_db.cc:
  event.h -> events.h
sql/sql_parse.cc:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/sql_show.cc:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/sql_yacc.yy:
  event.h -> events.h
  class Event_timed moved to event_timed.h
sql/events.cc:
  add_event -> create_event
  replace_event -> update_event
  event_timed_compare_q moved to event_scheduler.cc
sql/events.h:
  class Event_timed moved to event_timed.h
sql/events_priv.h:
  my_time_compare moved to mysql_priv.h
  event_timed_compare_q is static in event_scheduler.cc
sql/time.cc:
  moved interval_type_to_name from event.cc to here.
BitKeeper/etc/ignore:
  Added libmysqld/events.cc to the ignore list
2006-06-08 23:07:11 +02:00
unknown
261a42b8d0 manual merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/r/events_microsec.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/events_stress.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
2006-05-22 21:57:23 +02:00
unknown
2dce7ff6f1 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.


client/CMakeLists.txt:
  Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt
libmysql/CMakeLists.txt:
  Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt:
  Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt
sql/CMakeLists.txt:
  Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt
zlib/CMakeLists.txt:
  Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt
extra/CMakeLists.txt:
  Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt
tests/CMakeLists.txt:
  Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt
extra/yassl/CMakeLists.txt:
  Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
  Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt
storage/heap/CMakeLists.txt:
  Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt
storage/myisam/CMakeLists.txt:
  Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt:
  Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt
storage/csv/CMakeLists.txt:
  Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt
storage/innobase/CMakeLists.txt:
  Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt:
  Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt
libmysqld/examples/CMakeLists.txt:
  Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt
vio/CMakeLists.txt:
  Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt
dbug/CMakeLists.txt:
  Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt
strings/CMakeLists.txt:
  Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt
regex/CMakeLists.txt:
  Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt
mysys/CMakeLists.txt:
  Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt
storage/archive/CMakeLists.txt:
  Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt
storage/bdb/CMakeLists.txt:
  Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt
storage/blackhole/CMakeLists.txt:
  Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt
storage/example/CMakeLists.txt:
  Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt
CMakeLists.txt:
  Rename: cmakelists.txt.tmp -> CMakeLists.txt
2006-05-11 11:29:08 -05:00
Renamed from sql/cmakelists.txt (Browse further)