mariadb/myisam
unknown 214ad82803 Merging 4.1->5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
2003-11-19 15:19:46 +01: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 New thr_alarm struct for better integration with OS2 2000-11-28 04:47:47 +02:00
ft_boolean_search.c Merge with 4.0 2003-11-04 09:40:36 +02:00
ft_dump.c Delete duplicate error message names 2003-11-18 17:28:00 +02: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 2003-11-18 13:51:48 +02:00
ft_parser.c style fixes 2003-10-24 13:23:06 +02:00
ft_static.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
ft_stem.c Update copyright 2001-12-06 14:10:51 +02:00
ft_stopwords.c get rid of default_charset_info for index fulltext searches 2003-10-15 19:01:47 +02:00
ft_test1.c Merge with 4.0.3 2002-08-30 12:40:40 +03:00
ft_test1.h Update copyright 2001-12-06 14:10:51 +02:00
ft_update.c post-merge fixes 2003-10-31 15:49:59 +01:00
ftdefs.h query expansion for fulltext search 2003-10-23 15:21:06 +02:00
fulltext.h ft1->ft2 auto-conversion on INSERT (WL#725) 2003-10-02 20:22:29 +02:00
make-ccc Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am Makefile.am: 2003-07-16 13:57:04 -07: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 Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
mi_checksum.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_close.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_create.c merge with 4.0.15 2003-08-29 13:44:35 +03:00
mi_dbug.c MI_KEYSEG -> HA_KEYSEG 2002-04-25 15:10:29 +05:00
mi_delete.c Merge bk-internal:/home/bk/mysql-4.1/ 2003-10-31 10:34:34 +01:00
mi_delete_all.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_delete_table.c Update copyright 2001-12-06 14:10:51 +02:00
mi_dynrec.c More explicit error messages from myisamchk 2003-09-16 14:45:42 +03:00
mi_extra.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_info.c Fixed memory allocation in Unique to not allocate too much memory 2003-06-26 07:56:55 +03:00
mi_key.c Merge with 4.0.14 2003-08-11 22:44:43 +03:00
mi_keycache.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_locking.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_log.c Update copyright 2001-12-06 14:10:51 +02:00
mi_open.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_packrec.c Correct fix for buffer overruns for compressed blobs. 2003-09-24 14:33:23 +03:00
mi_page.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_panic.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_preload.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_range.c set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h: 2003-08-09 11:12:22 -07:00
mi_rename.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rfirst.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rkey.c After merge fixes 2003-05-21 21:39:58 +03:00
mi_rlast.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rnext.c Two-level index structure for FULLTEXT indexes 2003-01-21 19:24:34 +01:00
mi_rnext_same.c Removed some warnings reported by valgrind 2003-11-04 14:09:03 +02:00
mi_rprev.c Cleaned up SSL documentation 2001-10-02 05:53:00 +03:00
mi_rrnd.c myisammrg::index_next_same 2002-11-25 22:18:44 +01: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 Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
mi_static.c support for HA_READ_PREFIX_LAST_OR_PREV in headres 2002-10-25 14:09:47 +00:00
mi_statrec.c Ensure that share->tot_locks s updated correctly 2002-06-17 12:34:19 +03:00
mi_test1.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_test2.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_test3.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
mi_test_all.res Cleaned up SSL documentation 2001-10-02 05:53:00 +03:00
mi_test_all.sh Add detection of in_addr_t 2003-08-28 06:08:17 +03:00
mi_unique.c CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
mi_update.c merge with 4.0.15 2003-09-11 20:24:14 +03:00
mi_write.c Merge bk-internal:/home/bk/mysql-4.1/ 2003-10-31 10:34:34 +01:00
myisamchk.c Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
myisamdef.h Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
myisamlog.c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
myisampack.c merge with 4.0.15 2003-09-11 20:24:14 +03:00
NEWS Import changeset 2000-07-31 21:29:14 +02:00
rt_index.c fix for r-tree code (memory overlap reported by valgrind) 2003-11-04 17:58:18 +04:00
rt_index.h This ChangeSet adds RTREE support into myisam library. 2002-02-20 14:11:21 +04:00
rt_key.c set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h: 2003-08-09 11:12:22 -07:00
rt_key.h This ChangeSet adds RTREE support into myisam library. 2002-02-20 14:11:21 +04:00
rt_mbr.c Windows build fix 2003-01-18 14:04:34 -08:00
rt_mbr.h MI_KEYSEG -> HA_KEYSEG 2002-04-25 15:10:29 +05:00
rt_split.c Fix for memory overlap in rt_split.c (reported by valgrind) 2003-11-04 18:59:49 +04:00
rt_test.c MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now) 2003-06-03 14:59:17 +05:00
sort.c Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
sp_defs.h This ChangeSet adds RTREE support into myisam library. 2002-02-20 14:11:21 +04:00
sp_key.c R-tree bug fixes. 2003-03-20 20:55:53 +04:00
sp_test.c MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now) 2003-06-03 14:59:17 +05:00
test_pack Import changeset 2000-07-31 21:29:14 +02:00
TODO Import changeset 2000-07-31 21:29:14 +02:00