mariadb/storage/myisam
unknown 381fdf1a67 Merge gbichot3.local:/home/mysql_src/mysql-5.1-2
into  gbichot3.local:/home/mysql_src/mysql-maria; I'll fix manually.


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_static.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
include/my_handler.h:
  these ones I'll remove right away
mysys/my_handler.c:
  merge
sql/mysql_priv.h:
  merge
sql/set_var.cc:
  merge
storage/csv/ha_tina.cc:
  merge
storage/myisam/myisamdef.h:
  merge
2006-08-09 15:27:38 +02:00
..
ftbench Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
.cvsignore 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 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. 2006-05-11 11:29:08 -05:00
ft_boolean_search.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
ft_eval.c Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
ft_eval.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ft_myisam.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
ft_nlq_search.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
ft_parser.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
ft_static.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
ft_stem.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ft_stopwords.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
ft_test1.c Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
ft_test1.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ft_update.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
ftdefs.h Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2006-06-14 15:17:47 +05:00
fulltext.h Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
make-ccc Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 2006-05-24 08:16:53 +03:00
mi_cache.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_changed.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_check.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_checksum.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_close.c WL#2575 - Fulltext: Parser plugin for FTS 2005-12-28 16:05:30 +04:00
mi_create.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_dbug.c Merge 2005-10-06 10:54:07 +02:00
mi_delete.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_delete_all.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_delete_table.c Merge chilla.local:/home/mydev/mysql-5.0-ateam 2006-07-06 13:18:00 +02:00
mi_dynrec.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_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
mi_info.c This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
mi_key.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_keycache.c Remove compiler warnings 2006-03-29 17:04:00 +03:00
mi_locking.c myisamdef.h, mi_locking.c, mi_dynrec.c: 2006-02-22 08:32:58 +01:00
mi_log.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_open.c Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 2006-05-24 08:16:53 +03:00
mi_packrec.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_page.c Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
mi_panic.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_preload.c merge 2005-07-19 21:56:10 +02:00
mi_range.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_rename.c WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
mi_rfirst.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_rkey.c Merge chilla.local:/home/mydev/mysql-5.0-ateam 2006-07-06 13:18:00 +02:00
mi_rlast.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_rnext.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_rnext_same.c Merge mysql.com:/home/mydev/mysql-5.0-bug14980 2006-03-10 17:52:28 +01:00
mi_rprev.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_rrnd.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_rsame.c merge 2005-07-19 21:56:10 +02:00
mi_rsamepos.c unsigned char -> uchar 2006-06-19 12:45:34 +03:00
mi_scan.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_search.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_static.c Merge 2005-09-06 09:20:15 +02:00
mi_statrec.c Many files: 2005-12-01 13:34:48 +01:00
mi_test1.c Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 2006-05-24 08:16:53 +03:00
mi_test2.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
mi_test3.c Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
mi_test_all.res Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_test_all.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mi_unique.c Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
mi_update.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
mi_write.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
myisam_ftdump.c Bug #17122: myisam_ftdump requires write access to files although only reads from them 2006-07-21 13:59:59 -07:00
myisamchk.c Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 2006-05-24 08:16:53 +03:00
myisamdef.h Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
myisamlog.c Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 2006-05-24 08:16:53 +03:00
myisampack.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
NEWS Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rt_index.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
rt_index.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rt_key.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rt_key.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rt_mbr.c Merge chilla.local:/home/mydev/mysql-5.0-ateam 2006-07-06 13:18:00 +02:00
rt_mbr.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rt_split.c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-23 10:45:48 +02:00
rt_test.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
sort.c Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 2006-08-09 15:27:38 +02:00
sp_defs.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
sp_key.c Merge 2005-10-06 10:54:07 +02:00
sp_test.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
test_pack Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
TODO Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00