unknown 7463704e1c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  mysql.com:/home/my/mysql-5.1


client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge
client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge

2006-11-21 23:12:45 +02:00

..

.cvsignore

Import changeset

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

fill_func_tables.sh

Merge zim.(none):/home/brian/mysql/dep-5.0

2006-08-14 15:24:29 -07:00

fill_help_tables.sh

- added copyright header on top of the fill_help_tables.sql file (BUG#5772)

2005-02-09 17:40:10 +01: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 kahlann.erinye.com:/home/df/mysql/build/mtr-5.0

2006-11-14 14:49:45 +01:00

make_sharedlib_distribution.sh

make_sharedlib_distribution.sh:

2006-06-26 23:44:17 +02:00

make_win_bin_dist

make_win_bin_dist:

2006-10-21 00:57:08 +02:00

Makefile.am

included make_win_bin_dist (required for pushbuild) into distribution (make dist)

2006-09-01 16:55:35 +02:00

msql2mysql.sh

Import changeset

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

mysql_config.sh

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

2006-09-25 01:32:55 +02:00

mysql_convert_table_format.sh

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

mysql_create_system_tables.sh

Added --debug-info to most clients to detect memory leaks in mysql-test-run

2006-11-21 22:32:58 +02:00

mysql_find_rows.sh

Fix skipp -> skip once and for all.

2004-06-03 11:52:54 -05: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

fix for bug #16400

2006-02-24 00:29:50 +01:00

mysql_fix_privilege_tables.sql

Added --debug-info to most clients to detect memory leaks in mysql-test-run

2006-11-21 22:32:58 +02:00

mysql_install_db.sh

Merge zim.(none):/home/brian/mysql/dep-5.1

2006-08-14 21:26:33 -07:00

mysql_secure_installation.sh

added to mysql_secure_installation

2003-10-24 15:20:46 -04: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

Minor tweaks to help message of obscure script.

2004-04-04 18:48:41 -05:00

mysqlaccess.conf

configure fixes

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

mysqlaccess.sh

Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0

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

mysqlbug.sh

merge with 3.23

2004-03-25 22:05:09 +02:00

mysqld_multi.sh

Manual merge of the fix for bug#16106.

2006-01-16 16:48:05 +01:00

mysqld_safe.sh

Merge rama.(none):/home/jimw/my/tmp_merge

2006-07-28 15:51:48 -07:00

mysqldumpslow.sh

mysqldumpslow.sh:

2005-03-09 15:00:40 +01:00

mysqlhotcopy.sh

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

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