mariadb/myisam
unknown f8f714a2fb Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
sql/sql_table.cc:
  merge
sql/unireg.cc:
  merge
2005-05-14 18:31:22 +03:00
..
ftbench ftbench fixes 2003-10-23 23:33:06 +02:00
.cvsignore This ChangeSet adds RTREE support into myisam library. 2002-02-20 14:11:21 +04:00
ChangeLog
ft_boolean_search.c BUG#8351 post-review improvements. 2005-03-07 00:17:57 +04:00
ft_eval.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
ft_eval.h MI_KEYSEG -> HA_KEYSEG 2002-04-25 15:10:29 +05:00
ft_nlq_search.c Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0 2005-02-15 17:30:40 -06:00
ft_parser.c merged 2005-03-09 14:09:06 +01:00
ft_static.c Merge changes 2005-02-04 11:59:02 -08:00
ft_stem.c Update copyright 2001-12-06 14:10:51 +02:00
ft_stopwords.c Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash 2005-03-04 16:10:41 +04:00
ft_test1.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ft_test1.h Update copyright 2001-12-06 14:10:51 +02:00
ft_update.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ftdefs.h Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash 2005-03-04 16:10:41 +04:00
fulltext.h ft1->ft2 auto-conversion on INSERT (WL#725) 2003-10-02 20:22:29 +02:00
make-ccc
Makefile.am Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 12:03:37 +02:00
mi_cache.c enadling out-of-cache reads for shared IO_CACHE 2003-01-26 14:20:43 +01:00
mi_changed.c Update copyright 2001-12-06 14:10:51 +02:00
mi_check.c Merge 2005-04-13 16:24:17 +02:00
mi_checksum.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_close.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
mi_create.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
mi_dbug.c Merge with global tree 2004-12-19 20:25:19 +02:00
mi_delete.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_delete_all.c Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_delete_table.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_dynrec.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
mi_extra.c Changes to allow 5.0.3 to compile on Windows after XA was pushed 2005-02-23 16:29:03 -06:00
mi_info.c WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
mi_key.c Merge with 4.1 2005-05-14 18:31:22 +03:00
mi_keycache.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_locking.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
mi_log.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_open.c Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
mi_packrec.c Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
mi_page.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_panic.c Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_preload.c make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
mi_range.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_rename.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_rfirst.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rkey.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_rlast.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rnext.c Merging 2004-05-27 16:32:49 +05:00
mi_rnext_same.c Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity 2005-02-18 16:10:12 +04:00
mi_rprev.c Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
mi_rrnd.c just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
mi_rsame.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rsamepos.c Update copyright 2001-12-06 14:10:51 +02:00
mi_scan.c Update copyright 2001-12-06 14:10:51 +02:00
mi_search.c Merge 2005-04-16 17:58:11 +02:00
mi_static.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
mi_statrec.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
mi_test1.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test2.c Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
mi_test3.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test_all.res Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test_all.sh Add detection of in_addr_t 2003-08-28 06:08:17 +03:00
mi_unique.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_update.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_write.c concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
myisam_ftdump.c myisam/myisam_ftdump.c 2005-03-09 12:59:20 +01:00
myisamchk.c Merge 2005-03-25 10:43:35 +04:00
myisamdef.h concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
myisamlog.c Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
myisampack.c Merge mysql.com:/home/mydev/mysql-4.1-4100 2005-04-28 19:34:05 +02:00
NEWS
rt_index.c fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
rt_index.h Merging 2004-06-02 19:17:35 +05:00
rt_key.c Merging 2004-06-02 19:17:35 +05:00
rt_key.h Merging 2004-06-02 19:17:35 +05:00
rt_mbr.c Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
rt_mbr.h Merging 2004-06-02 19:17:35 +05:00
rt_split.c Merging 2004-06-02 19:17:35 +05:00
rt_test.c Review of all code pushed since last review 2004-10-20 01:28:42 +03:00
sort.c merged 2005-01-24 19:41:42 +01:00
sp_defs.h WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04:00
sp_key.c Fix for bug #6516 (Server crash loading spatial data) 2004-12-10 16:06:49 +04:00
sp_test.c Merging 2004-05-27 16:32:49 +05:00
test_pack
TODO