mariadb/isam
unknown f97f48acaf Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-apply-patch:
  Delete: netware/BUILD/apply-patch
BitKeeper/deleted/.del-save-patch:
  Delete: netware/BUILD/save-patch
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
extra/resolveip.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/errors.c:
  Auto merged
mysys/my_symlink.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/unireg.h:
  Auto merged
client/mysqldump.c:
  merge with 4.0 (quoted names)
configure.in:
  use local file
include/my_pthread.h:
  Use local file
innobase/include/srv0srv.h:
  Use local file
innobase/row/row0sel.c:
  Use local file
innobase/srv/srv0srv.c:
  Use local file
libmysql/libmysql.c:
  Use local file
myisam/myisamchk.c:
  merge fixes
mysql-test/r/func_crypt.result:
  update results
mysql-test/r/order_by.result:
  update results
mysql-test/r/query_cache.result:
  update results
mysql-test/r/range.result:
  update results
mysql-test/r/rpl_reset_slave.result:
  update results
mysql-test/r/rpl_trunc_binlog.result:
  update results
mysql-test/t/func_crypt.test:
  Added disable_warnings/enable warnings
mysql-test/t/query_cache.test:
  merge tests
mysql-test/t/range.test:
  merge tests
mysys/charset.c:
  use local file (will merge patch separately)
sql/ha_innodb.cc:
  use local file
sql/log_event.cc:
  new slave_proxy_id handling
sql/slave.h:
  merge
sql/sql_base.cc:
  merge
sql/sql_parse.cc:
  Fixes for counting user connect resourses
  Added function comments for involved functions
sql/sql_select.cc:
  Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
sql/unireg.cc:
  merge fixes
support-files/mysql.server.sh:
  merge fixes
2003-11-04 09:40:36 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
_cache.c Update copyright 2001-12-06 14:10:51 +02:00
_dbug.c Update copyright 2001-12-06 14:10:51 +02:00
_dynrec.c Portability fix 2001-11-07 00:13:29 +02:00
_key.c Some optimization in CHARSET_INFO: 2003-04-01 12:45:16 +05:00
_locking.c Many files: 2003-08-02 02:43:18 -07:00
_packrec.c Update copyright 2001-12-06 14:10:51 +02:00
_page.c set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h: 2003-08-09 11:12:22 -07:00
_search.c merge with 4.0.15 2003-08-29 13:44:35 +03:00
_statrec.c Update copyright 2001-12-06 14:10:51 +02:00
changed.c Update copyright 2001-12-06 14:10:51 +02:00
ChangeLog Import changeset 2000-07-31 21:29:14 +02:00
close.c Many files: 2003-08-02 02:43:18 -07:00
create.c Lots of code fixes to the replication code (especially the binary logging and index log file handling) 2002-08-08 03:12:02 +03:00
delete.c Update copyright 2001-12-06 14:10:51 +02:00
extra.c Call my_sync() after all data is written to .frm file 2003-11-02 15:55:02 +02:00
info.c Update copyright 2001-12-06 14:10:51 +02:00
isamchk.c Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
isamdef.h table checksum background: 2003-08-05 21:14:15 +02:00
isamlog.c Many files: 2003-08-02 02:43:18 -07:00
log.c Update copyright 2001-12-06 14:10:51 +02:00
make-ccc Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am removed redundant -I include-dirs 2002-11-26 14:01:08 +01:00
open.c merge 2003-09-03 19:53:08 +03:00
pack_isam.c table checksum background: 2003-08-05 21:14:15 +02:00
panic.c Many files: 2003-08-02 02:43:18 -07:00
range.c Update copyright 2001-12-06 14:10:51 +02:00
rfirst.c Update copyright 2001-12-06 14:10:51 +02:00
rkey.c Update copyright 2001-12-06 14:10:51 +02:00
rlast.c Update copyright 2001-12-06 14:10:51 +02:00
rnext.c Update copyright 2001-12-06 14:10:51 +02:00
rprev.c Update copyright 2001-12-06 14:10:51 +02:00
rrnd.c Update copyright 2001-12-06 14:10:51 +02:00
rsame.c Update copyright 2001-12-06 14:10:51 +02:00
rsamepos.c Update copyright 2001-12-06 14:10:51 +02:00
sort.c Update copyright 2001-12-06 14:10:51 +02:00
static.c full support for HA_READ_PREFIX_LAST_OR_PREV in ISAM 2002-10-25 14:16:52 +00:00
test1.c Update copyright 2001-12-06 14:10:51 +02:00
test2.c Merge 2003-10-30 10:45:28 -08:00
test3.c Many files: 2003-08-02 02:43:18 -07:00
test_all Import changeset 2000-07-31 21:29:14 +02:00
test_all.res ixed overflow bug in MyISAM and ISAM when using packed tables with a lot of fields and blobs 2003-08-28 12:27:35 +03:00
update.c Update copyright 2001-12-06 14:10:51 +02:00
write.c Update copyright 2001-12-06 14:10:51 +02:00