unknown e9c1e75b48 Merge 4.1 -> 5.0 ...

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/client_test.c:
  Auto merged

2004-05-07 18:52:06 +02: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

…

ft_boolean_search.c

postreview fixes

2004-04-29 12:25:56 +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

after-merge fix: make concurrent-insert-skip code ft2-aware

2004-04-27 21:17:10 +02:00

ft_parser.c

BTREE-indexes in HEAP tables can now be used to optimize ORDER BY

2004-03-25 15:05:01 +02:00

ft_static.c

ft_boolean_syntax made changeable

2004-02-16 18:53:00 +01:00

ft_stem.c

…

ft_stopwords.c

BTREE-indexes in HEAP tables can now be used to optimize ORDER BY

2004-03-25 15:05:01 +02:00

ft_test1.c

Merge with 4.0.3

2002-08-30 12:40:40 +03:00

ft_test1.h

…

ft_update.c

BTREE-indexes in HEAP tables can now be used to optimize ORDER BY

2004-03-25 15:05:01 +02: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

…

Makefile.am

Merge with 4.0.18

2004-02-11 00:06:46 +01:00

mi_cache.c

enadling out-of-cache reads for shared IO_CACHE

2003-01-26 14:20:43 +01:00

mi_changed.c

…

mi_check.c

Merge 4.1 -> 5.0.

2004-04-07 19:07:44 +02:00

mi_checksum.c

CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

2003-11-18 13:47:27 +02:00

mi_close.c

Merge key cache structures to one

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

mi_create.c

myisam_data_pointer_size

2004-05-01 15:41:59 +02:00

mi_dbug.c

Merge with 4.0.17

2003-12-17 17:35:34 +02:00

mi_delete_all.c

Merge key cache structures to one

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

mi_delete_table.c

Code cleanup

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

mi_delete.c

Code cleanup

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

mi_dynrec.c

Merge with 4.0.18

2004-02-11 00:06:46 +01:00

mi_extra.c

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

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

mi_info.c

myisam_data_pointer_size

2004-05-01 15:41:59 +02:00

mi_key.c

Merge with 4.0.17

2003-12-17 17:35:34 +02:00

mi_keycache.c

mi_keycache.c:

2003-11-25 22:20:31 -08:00

mi_locking.c

Fixed many compiler warnings

2004-04-05 13:56:05 +03:00

mi_log.c

Code cleanup

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

mi_open.c

Merge with 4.0.17

2003-12-17 17:35:34 +02:00

mi_packrec.c

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

mi_page.c

Code cleanup

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

mi_panic.c

Merge key cache structures to one

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

mi_preload.c

Added missing SSL library (Should be in source distribution)

2003-11-28 12:18:13 +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

Code cleanup

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

mi_rfirst.c

…

mi_rkey.c

After merge fixes

2003-05-21 21:39:58 +03:00

mi_rlast.c

…

mi_rnext_same.c

Removed some warnings reported by valgrind

2003-11-04 14:09:03 +02:00

mi_rnext.c

Fixed many compiler warnings

2004-04-05 13:56:05 +03: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

…

mi_rsamepos.c

…

mi_scan.c

…

mi_search.c

Cleanups & safety fixes

2004-03-25 22:11:22 +02:00

mi_static.c

myisam_data_pointer_size

2004-05-01 15:41:59 +02:00

mi_statrec.c

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

mi_test1.c

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

mi_test2.c

Merge key cache structures to one

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

mi_test3.c

Merge key cache structures to one

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

mi_test_all.res

…

mi_test_all.sh

Add detection of in_addr_t

2003-08-28 06:08:17 +03:00

mi_unique.c

BTREE-indexes in HEAP tables can now be used to optimize ORDER BY

2004-03-25 15:05:01 +02:00

mi_update.c

Code cleanup

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

mi_write.c

Fixed warnings from valgrind (not a bug)

2004-04-06 12:13:43 +03:00

myisam_ftdump.c

Windows fixes for VC++ compiler compability

2004-05-05 02:59:17 -03:00

myisamchk.c

Merge 4.1 -> 5.0

2004-05-07 18:52:06 +02:00

myisamdef.h

Merge 4.1 -> 5.0

2004-05-07 18:52:06 +02:00

myisamlog.c

Max open files handling moved to my_set_max_open_files()

2004-02-19 19:33:09 +02:00

myisampack.c

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

NEWS

…

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

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

sort.c

Merged 4.1 -> 5.0

2003-12-05 13:11:50 +01: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

just tried to find all 'skipp' and replace it with 'skip'.

2004-02-02 20:25:39 +04:00

test_pack

…

TODO

…