unknown 9422fee7de Manually merged ...

mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged

2006-01-16 16:57:15 +03:00

..

BUILD

Fix for Netware build.

2006-01-12 20:31:00 +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

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

2005-12-13 18:22:00 +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

mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:

2005-12-19 01:12:11 +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

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

2005-12-13 18:44:20 +02:00

myisam_ftdump.def

Applied some patches for Netware.

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

myisamchk.def

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

2005-08-25 12:08:26 +03:00

myisamlog.def

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

2005-12-13 18:22:00 +02:00

myisampack.def

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

2005-12-13 18:22:00 +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

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

2005-12-13 18:22:00 +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

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

2005-12-04 20:57:34 +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

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

2005-12-13 18:22:00 +02:00

mysql.xdc

New XDC file for NetWare pre-emption

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

mysqladmin.def

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

2005-12-13 18:22:00 +02:00

mysqlbinlog.def

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

2005-12-13 18:22:00 +02:00

mysqlcheck.def

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

2005-12-13 18:22:00 +02:00

mysqld_safe.c

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

2006-01-12 20:28:23 +02:00

mysqld_safe.def

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

2005-12-13 18:22:00 +02:00

mysqld.def

Applied some patches for Netware.

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

mysqldump.def

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

2005-12-13 18:22:00 +02:00

mysqlimport.def

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

2005-12-13 18:22:00 +02:00

mysqlshow.def

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

2005-08-25 12:08:26 +03:00

mysqlslap.def

mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:

2005-12-19 01:12:11 +01:00

mysqltest.def

Applied some patches for Netware.

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

pack_isam.def

Small fixes for Netware.

2005-10-14 08:45:41 +03:00

perror.def

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

2005-12-13 18:22:00 +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