unknown 95a3509a66 Merge mysql.com:/opt/local/work/mysql-4.1-root ...

into  mysql.com:/opt/local/work/mysql-5.0-root


BitKeeper/deleted/.del-rpl_ignore_table.result:
  Delete: mysql-test/r/rpl_ignore_table.result
BitKeeper/deleted/.del-rpl_multi_update4.result:
  Delete: mysql-test/r/rpl_multi_update4.result
BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
  Delete: mysql-test/t/rpl_ignore_table-slave.opt
BitKeeper/deleted/.del-rpl_ignore_table.test:
  Delete: mysql-test/t/rpl_ignore_table.test
BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
  Delete: mysql-test/t/rpl_multi_update4-slave.opt
BitKeeper/deleted/.del-disabled.def:
  Auto merged
BitKeeper/deleted/.del-rpl_multi_update4.test:
  Delete: mysql-test/t/rpl_multi_update4.test
heap/hp_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
configure.in:
  Manual merge.
libmysql/libmysql.c:
  Manual merge.
mysql-test/r/heap.result:
  Manual merge.
mysql-test/r/heap_hash.result:
  Manual merge.
mysql-test/r/kill.result:
  Manual merge.
sql/ha_heap.cc:
  Manual merge.
sql/ha_heap.h:
  Manual merge.
sql/item_timefunc.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

2006-02-02 18:17:18 +03:00

..

_check.c

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2005-10-27 23:43:20 +03:00

_rectest.c

RB-Tree indexes support in HEAP tables

2002-04-25 13:36:55 +05:00

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

ChangeLog

Import changeset

2000-07-31 21:29:14 +02:00

heapdef.h

Add support for up to VARCHAR (size up to 65535)

2004-12-06 02:00:37 +02:00

hp_block.c

Fix for bug#5138 continued: added comments, removed extra debug printf calls, changed ha_heap::records_in_range to use table->rec_per_key.

2004-10-12 18:21:25 +04:00

hp_clear.c

Fix for bug#5138: hash indexes on heap tables support statistics.

2004-09-08 02:07:53 +04:00

hp_close.c

RB-Tree indexes support in HEAP tables

2002-04-25 13:36:55 +05:00

hp_create.c

Merge mysql.com:/opt/local/work/mysql-4.1-root

2006-02-02 18:17:18 +03:00

hp_delete.c

Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1

2005-08-20 16:38:55 -04:00

hp_extra.c

WL#1648 - Start/Stop Inserting Duplicates Into a Table

2004-03-18 16:47:16 +01:00

hp_hash.c

Bug#12891:

2005-09-01 19:31:08 +05:00

hp_info.c

After merge fixes

2004-02-16 10:03:25 +02:00

hp_open.c

Add 0x before pointers (to help with debugging)

2004-12-18 05:19:21 +02:00

hp_panic.c

RB-Tree indexes support in HEAP tables

2002-04-25 13:36:55 +05:00

hp_rename.c

RB-Tree indexes support in HEAP tables

2002-04-25 13:36:55 +05:00

hp_rfirst.c

Bug #6748 heap_rfirst() doesn't work (and never did!)

2004-11-22 14:53:18 +01:00

hp_rkey.c

Add 0x before pointers (to help with debugging)

2004-12-18 05:19:21 +02:00

hp_rlast.c

Stupid bug has been fixed

2002-07-12 13:12:32 +05:00

hp_rnext.c

Heap table code cleanup

2002-05-23 19:26:16 +05:00

hp_rprev.c

Heap table code cleanup

2002-05-23 19:26:16 +05:00

hp_rrnd.c

Add 0x before pointers (to help with debugging)

2004-12-18 05:19:21 +02:00

hp_rsame.c

RB-Tree indexes support in HEAP tables

2002-04-25 13:36:55 +05:00

hp_scan.c

Merge with 4.0.6

2002-12-05 19:38:42 +02:00

hp_static.c

Update copyright

2001-12-06 14:10:51 +02:00

hp_test1.c

Merge key cache structures to one

2003-11-20 22:06:25 +02:00

hp_test2.c

Merge key cache structures to one

2003-11-20 22:06:25 +02:00

hp_update.c

fixes for windows 64-bit compiler warnings

2005-06-13 12:41:15 +02:00

hp_write.c

Merge with 4.1

2005-01-15 14:09:45 +02:00

make-ccc

Import changeset

2000-07-31 21:29:14 +02:00

Makefile.am

Merge

2005-07-06 00:06:11 +02:00