unknown 1cf8117863 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 ...

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/r/myisam.result:
  Manually merged.
mysql-test/t/myisam.test:
  Manually merged.

2007-01-25 01:44:30 +04:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

fill_func_tables.sh

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

fill_help_tables.sh

Bug#24270

2007-01-02 09:42:13 -08:00

fill_help_tables.sql

More changes to reflect the removal of manual.texi from the sources:

2005-04-13 18:29:23 +02:00

make_binary_distribution.sh

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51

2007-01-18 08:30:35 -07:00

make_sharedlib_distribution.sh

my_strtoll10-x86.s:

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

make_win_bin_dist

Many files:

2006-12-31 02:29:11 +01:00

Makefile.am

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

msql2mysql.sh

Import changeset

2000-07-31 21:29:14 +02:00

mysql_config.sh

my_strtoll10-x86.s:

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

mysql_convert_table_format.sh

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mysql_create_system_tables.sh

Bug#24270

2007-01-02 09:42:13 -08:00

mysql_find_rows.sh

my_strtoll10-x86.s:

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

mysql_fix_extensions.sh

mysql_fix_extensions.sh tool copied from 4.0 tree (referenced in manual).

2002-05-16 10:13:42 +10:00

mysql_fix_privilege_tables.sh

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mysql_fix_privilege_tables.sql

Bug#24270

2007-01-02 09:42:13 -08:00

mysql_install_db.sh

Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build

2007-01-11 13:50:48 -07:00

mysql_secure_installation.sh

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build

2007-01-01 05:31:23 +01:00

mysql_setpermission.sh

- Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>

2003-04-25 21:58:25 +02:00

mysql_zap.sh

my_strtoll10-x86.s:

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

mysqlaccess.conf

configure fixes

2000-09-14 15:10:06 +03:00

mysqlaccess.sh

BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently

2007-01-09 09:32:56 +01:00

mysqlbug.sh

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

2007-01-07 09:31:49 -05:00

mysqld_multi.sh

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780

2007-01-22 16:38:54 +01:00

mysqld_safe.sh

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

2006-12-14 12:21:37 -08:00

mysqldumpslow.sh

Search through options to find where the slow query log actually is.

2006-12-18 21:12:01 -08:00

mysqlhotcopy.sh

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

2006-10-03 09:05:34 +02:00