mariadb/storage/heap
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
_check.c Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
_rectest.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ChangeLog 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_heap.cc Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
ha_heap.h Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
heapdef.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_block.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_clear.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_close.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_create.c Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0 2006-05-18 18:49:52 +05:00
hp_delete.c Merge zim.(none):/home/brian/mysql/dep-5.0 2006-08-14 15:24:29 -07:00
hp_extra.c unsigned char -> uchar 2006-06-19 12:45:34 +03:00
hp_hash.c Merge 2005-09-12 14:22:06 +02:00
hp_info.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_open.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_panic.c This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
hp_rename.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rfirst.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rkey.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rlast.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rnext.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rprev.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rrnd.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rsame.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_scan.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_static.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_test1.c This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
hp_test2.c This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
hp_update.c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-15 20:07:31 +02:00
hp_write.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2006-05-30 16:07:49 +03: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
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