unknown 9f04f9d035 Merge with 4.1 ...

BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
netware/BUILD/nwbootstrap:
  merge: keep local
scripts/make_binary_distribution.sh:
  merge: keep local
sql/ha_heap.cc:
  Trivial merge
sql/ha_innodb.cc:
  Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
  Simple merge
sql/item_func.cc:
  Simple merge
sql/item_row.cc:
  Simple merge
sql/item_strfunc.cc:
  Simple merge
sql/item_subselect.cc:
  Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed

2005-02-10 02:27:37 +02:00

..

BUILD

Applied a patch for Netware.

2005-02-08 19:49:40 +02:00

comp_err.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

init_db.sql

Some fixes for Netware.

2004-12-13 14:19:34 +02:00

install_test_db.ncf

Many files:

2003-02-01 00:42:26 +01:00

isamchk.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

isamlog.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

libmysql.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

libmysql.imp

Minor Novell supplied changes for 4.1 (inside netware directory)

2004-01-13 01:10:21 -01:00

libmysqlmain.c

Many files:

2003-02-01 00:42:26 +01:00

Makefile.am

Many files:

2005-01-01 20:54:45 +01:00

my_manage.c

A patch for Netware.

2005-01-13 19:24:54 +02:00

my_manage.h

Merging 4.1 to 5.0.

2004-05-26 17:04:45 +02:00

my_print_defaults.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

myisam_ftdump.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

myisamchk.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

myisamlog.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

myisampack.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql_fix_privilege_tables.pl

Some fixes for Netware.

2004-12-13 14:19:34 +02:00

mysql_install_db.c

Added patches from Novell

2004-05-25 22:00:14 +03:00

mysql_install_db.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql_install.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql_secure_installation.pl

Many files:

2003-02-01 00:42:26 +01:00

mysql_test_run.c

Applied a patch for Netware.

2005-02-08 19:49:40 +02:00

mysql_test_run.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql_waitpid.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysql.xdc

New XDC file for NetWare pre-emption

2003-03-31 18:09:13 -05:00

mysqladmin.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqlbinlog.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqlcheck.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqld_safe.c

After merge fixes

2004-06-21 10:21:20 +03:00

mysqld_safe.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqld.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqldump.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqlimport.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqlshow.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

mysqltest.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

pack_isam.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

perror.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

replace.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

resolve_stack_dump.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

resolveip.def

Applied some patches for Netware.

2004-11-29 18:32:52 +02:00

static_init_db.sql

Changed prototype of killed_ptr() to make it more portable

2004-05-26 19:12:49 +03:00

test_db.sql

Applied a few Netware patches.

2004-09-16 16:24:44 +03:00