unknown 75ed6f1a3b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_time.h:
  manual merge.
mysql-test/mysql-test-run.pl:
  manual merge.
mysql-test/r/ps.result:
  manual merge.
mysql-test/t/disabled.def:
  manual merge.
mysql-test/t/ps.test:
  manual merge.

2006-11-02 17:51:59 -05:00

..

BUILD

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

2006-11-02 17:51:59 -05: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

libmysqlmain.c

Many files:

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

Makefile.am

Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp

2006-09-28 10:39:55 +02:00

my_manage.c

A patch for Netware.

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

my_manage.h

Several Netware specific fixes.

2006-02-02 16:22:31 +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

Fixed warning message breakage.

2006-08-13 22:28:41 -07: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_secure_installation.pl

Many files:

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

mysql_test_run.c

Fixed warning message breakage.

2006-08-13 22:28:41 -07: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