unknown 8cc480915f Merge bk-internal:/home/bk/mysql-5.0 ...

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

2006-10-20 11:02:56 +02:00

..

ftbench

ftbench fixes

2003-10-23 23:33:06 +02:00

.cvsignore

…

ChangeLog

…

CMakeLists.txt

Additional files for cmake support

2006-08-31 19:52:42 +02:00

ft_boolean_search.c

Several fixes revelaled by Intel compiler.

2005-09-23 16:47:08 +03:00

ft_eval.c

…

ft_eval.h

…

ft_nlq_search.c

Fix for BUG#13582. Theoretically possible to try to overallocate RAM in some fulltext queries.

2005-09-28 19:03:35 -05:00

ft_parser.c

Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1

2005-11-26 20:23:20 +01:00

ft_static.c

Merge changes

2005-02-04 11:59:02 -08:00

ft_stem.c

…

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

…

ft_update.c

Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1

2006-01-23 20:07:26 +04: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

make dist changes for Cmake build

2006-09-01 10:32:12 +02:00

mi_cache.c

…

mi_changed.c

…

mi_check.c

Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one

2006-10-09 20:03:12 +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

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

2006-07-08 21:45:02 +04:00

mi_dbug.c

Merge mysql.com:/home/mydev/mysql-4.1-4100

2005-09-23 17:27:07 +02:00

mi_delete_all.c

CHECKSUM TABLE now allows concurrent inserts

2005-09-27 20:11:09 +02:00

mi_delete_table.c

Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail

2006-06-27 11:26:41 +02:00

mi_delete.c

Merge chilla.local:/home/mydev/mysql-4.1-bug22384

2006-09-28 21:50:46 +02:00

mi_dynrec.c

Bug#20719 - Reading dynamic records with write buffer could fail

2006-09-27 11:55:30 +02:00

mi_extra.c

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-08-31 19:12:16 -07: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 mysql.com:/home/mydev/mysql-4.1-bug17877

2006-07-05 11:23:21 +02:00

mi_keycache.c

After merge fixes

2004-12-31 03:47:56 +02:00

mi_locking.c

Bug#20789 Merge Subtable Rename Causes Crash

2006-09-19 17:40:09 +02:00

mi_log.c

Code cleanup

2004-01-19 23:51:17 +01:00

mi_open.c

Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one

2006-10-09 20:03:12 +02:00

mi_packrec.c

Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one

2006-10-09 20:03:12 +02: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

Bug#10932 - Building server with key limit of 128, makes test cases fail

2005-07-19 14:13:56 +02:00

mi_range.c

Merge mysql.com:/home/hf/work/21888/my41-21888

2006-09-29 17:57:16 +05:00

mi_rename.c

Code cleanup

2004-01-19 23:51:17 +01:00

mi_rfirst.c

…

mi_rkey.c

Bug#14400 - Query joins wrong rows from table which is subject of

2006-09-22 17:23:25 +02:00

mi_rlast.c

…

mi_rnext_same.c

Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX

2006-03-10 15:03:04 +01:00

mi_rnext.c

Merging

2004-05-27 16:32:49 +05: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

Bug#10932 - Building server with key limit of 128, makes test cases fail

2005-07-19 14:13:56 +02:00

mi_rsamepos.c

Bug#10932 - Building server with key limit of 128, makes test cases fail

2005-07-19 14:13:56 +02:00

mi_scan.c

…

mi_search.c

Manual merge

2006-03-30 17:14:55 +04:00

mi_static.c

Merge mysql.com:/usr/home/ram/work/4.1.b4214

2005-09-05 18:28:56 +05: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

Several fixes revelaled by Intel compiler.

2005-09-23 16:47:08 +03:00

mi_test2.c

Bug#12920 - key_read_requests counter appears to re-set

2005-09-14 13:18:16 +02:00

mi_test3.c

Add 0x before pointers (to help with debugging)

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

mi_test_all.res

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

2006-09-19 11:27:00 +02:00

mi_test_all.sh

Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""

2006-08-10 22:41:19 +03:00

mi_unique.c

Fix for bug #20709: Collation not used in group by on 4.1.

2006-08-10 15:06:22 +05:00

mi_update.c

Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1

2006-08-09 14:33:45 +05:00

mi_write.c

Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment

2006-05-31 10:22:44 +02:00

myisam_ftdump.c

BUG#21459 - myisam_ftdump gives bad counts for common words

2006-09-20 17:12:37 +05:00

myisamchk.c

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

2005-12-04 15:34:47 +02:00

myisamdef.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines

2006-10-11 17:57:47 +02:00

myisamlog.c

BUG#18160 - Memory-/HEAP Table endless growing indexes

2006-04-19 15:13:50 +05:00

myisampack.c

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

NEWS

…

rt_index.c

Bug#17877 - Corrupted spatial index

2006-06-28 14:27:37 +02: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

Bug#17877 - Corrupted spatial index

2006-06-28 14:27:37 +02:00

rt_mbr.h

Merging

2004-06-02 19:17:35 +05:00

rt_split.c

Added some missing casts and changed a define for alloca().

2005-07-20 13:27:57 +03:00

rt_test.c

Review of all code pushed since last review

2004-10-20 01:28:42 +03:00

sort.c

Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines

2006-10-19 18:04:34 +05:00

sp_defs.h

WL#1163 To make spatial code optional

2004-03-12 18:51:03 +04:00

sp_key.c

Several fixes revelaled by Intel compiler.

2005-09-23 16:47:08 +03:00

sp_test.c

Merging

2004-05-27 16:32:49 +05:00

test_pack

…

TODO

…