mariadb/storage/myisammrg
unknown 9910031cbe Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/blackhole/ha_blackhole.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/example/ha_example.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/heap/ha_heap.h:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
sql/ha_ndbcluster.h:
  merge
sql/handler.h:
  merge
sql/sql_delete.cc:
  merge
storage/archive/ha_archive.h:
  merge
storage/innobase/handler/ha_innodb.cc:
  merge
storage/innobase/handler/ha_innodb.h:
  merge
storage/myisam/ha_myisam.cc:
  merge
storage/myisammrg/ha_myisammrg.h:
  merge
2006-10-18 18:51:39 +10:00
..
.cvsignore Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
CMakeLists.txt fix for windows build 2006-08-24 22:10:55 -07:00
ha_myisammrg.cc Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
ha_myisammrg.h Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
make-ccc Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Bug#22417 2006-09-18 19:31:08 -07:00
myrg_close.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_create.c WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
myrg_def.h All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
myrg_delete.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_extra.c This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
myrg_info.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_locking.c Merge naruto.:C:/cpp/bug20789/my50-bug20789 2006-09-20 07:40:56 +02:00
myrg_open.c Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 2006-09-29 00:23:43 +05:00
myrg_panic.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_queue.c Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 2006-09-29 00:23:43 +05:00
myrg_range.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rfirst.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rkey.c Merge 2005-10-06 10:54:07 +02:00
myrg_rlast.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rnext.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rnext_same.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rprev.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rrnd.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_rsame.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_static.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_update.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
myrg_write.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
plug.in Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 2006-08-18 21:19:19 -07:00