unknown 1cf8117863 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 ...

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/r/myisam.result:
  Manually merged.
mysql-test/t/myisam.test:
  Manually merged.

2007-01-25 01:44:30 +04:00

..

ftbench

Fixed warning message breakage.

2006-08-13 22:28:41 -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

Many files:

2006-12-31 02:29:11 +01:00

ft_boolean_search.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_eval.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_eval.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

ft_nlq_search.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_parser.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_static.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_stem.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_stopwords.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_test1.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_test1.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ft_update.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ftdefs.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

fulltext.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

ha_myisam.cc

Merge mysql.com:/d2/hf/clean/my51-clean

2006-12-31 12:41:42 +04:00

ha_myisam.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

make-ccc

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

Makefile.am

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_cache.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_changed.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_check.c

mi_check.c:

2007-01-08 17:27:28 +02:00

mi_checksum.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_close.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_create.c

Merge chilla.local:/home/mydev/mysql-5.0-bug24607

2007-01-19 13:08:09 +01:00

mi_dbug.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_delete_all.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_delete_table.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_delete.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_dynrec.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-03 10:27:51 +01:00

mi_extra.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_info.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_key.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_keycache.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

mi_locking.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-03 10:27:51 +01:00

mi_log.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_open.c

Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines

2007-01-23 16:36:29 +04:00

mi_packrec.c

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

2007-01-18 08:41:52 -07:00

mi_page.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_panic.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_preload.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_range.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rename.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rfirst.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rkey.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rlast.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rnext_same.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rnext.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rprev.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rrnd.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rsame.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_rsamepos.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_scan.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_search.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_static.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_statrec.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_test1.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_test2.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_test3.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_test_all.res

Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty

2006-09-19 14:33:29 +02:00

mi_test_all.sh

Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty

2006-09-19 14:33:29 +02:00

mi_unique.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mi_update.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-03 10:27:51 +01:00

mi_write.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-03 10:27:51 +01:00

myisam_ftdump.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myisamchk.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

myisamdef.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2007-01-03 10:27:51 +01:00

myisamlog.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myisampack.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

NEWS

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

plug.in

bug #23369 (Embedded library can't be linked)

2006-10-18 17:03:37 +05:00

rt_index.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_index.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_key.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

rt_key.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_mbr.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_mbr.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_split.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

rt_test.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

sort.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

sp_defs.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

sp_key.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

sp_test.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01: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