unknown 6859d8b8c7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint ...

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


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
scripts/mysqld_safe.sh:
  Manual merge.

2007-10-08 12:40:21 -04:00

..

BUILD

Merge trift2.:/MySQL/M50/netware2-5.0

2007-08-24 23:12:19 +02:00

comp_err.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

install_test_db.ncf

…

libmysql.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

libmysqlmain.c

…

Makefile.am

Merge trift2.:/MySQL/M50/netware2-5.0

2007-08-24 23:40:36 +02:00

my_manage.c

…

my_manage.h

…

my_print_defaults.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

myisam_ftdump.def

myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:

2006-12-02 04:25:41 +01:00

myisamchk.def

myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:

2006-12-02 04:25:41 +01:00

myisamlog.def

myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:

2006-12-02 04:25:41 +01:00

myisampack.def

myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:

2006-12-02 04:25:41 +01:00

mysql_client_test.def

Makefile.am:

2006-12-02 06:06:31 +01:00

mysql_fix_privilege_tables.pl

Many files:

2006-12-23 20:17:15 +01:00

mysql_install_db.c

…

mysql_install_db.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysql_secure_installation.pl

Many files:

2006-12-23 20:17:15 +01:00

mysql_test_run.c

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

2007-10-08 12:40:21 -04:00

mysql_test_run.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysql_upgrade.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysql_waitpid.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysql.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysql.xdc

…

mysqladmin.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqlbinlog.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqlcheck.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqld_safe.c

Bug #15327: configure: --with-tcp-port option being partially ignored

2007-09-13 16:19:46 +02:00

mysqld_safe.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqld.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqldump.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqlimport.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqlshow.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

mysqlslap.def

…

mysqltest.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

perror.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

replace.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

resolve_stack_dump.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

resolveip.def

mysql_upgrade.def Makefile.am:

2006-12-01 23:09:14 +01:00

static_init_db.sql

…