unknown d278381ec8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 ... into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0 client/mysql.cc: Auto merged heap/hp_delete.c: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/grant2.result: Manual merge mysql-test/r/heap_btree.result: Manual merge mysql-test/r/mysql_client.result: Manual merge mysql-test/t/grant2.test: Manual merge mysql-test/t/heap_btree.test: Manual merge mysql-test/t/mysql_client.test: Manual merge		2006-08-09 22:23:41 -04:00
..
.cvsignore
fill_func_tables.sh	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1	2006-08-09 22:23:41 -04:00
fill_help_tables.sh
fill_help_tables.sql
make_binary_distribution.sh	Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge	2006-07-29 13:43:34 +04:00
make_sharedlib_distribution.sh	make_sharedlib_distribution.sh:	2006-06-26 23:44:17 +02:00
make_win_src_distribution.sh	Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql	2006-08-02 16:46:55 +04:00
Makefile.am	Improved fix for bug#18516 (also 19353):	2006-06-22 14:28:05 +02:00
msql2mysql.sh
mysql_config.sh	mysql_config.sh:	2006-03-29 14:59:53 +02:00
mysql_convert_table_format.sh
mysql_create_system_tables.sh	type_binary.result, type_binary.test:	2005-10-13 19:16:19 +05:00
mysql_explain_log.sh	Bug #19779: mysql_explain_log documentation is outdated.	2006-07-13 10:48:34 -04:00
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh	Make mysql_fix_privilege_tables.sh not dependent on the current directory.	2005-10-05 01:08:22 +04:00
mysql_fix_privilege_tables.sql	Fixes to embedded server to be able to run tests with it	2006-02-24 18:34:15 +02:00
mysql_install_db.sh	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1	2006-08-09 22:23:41 -04:00
mysql_prepare_privilege_tables_for_5.sql
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_tableinfo.sh	Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and	2005-04-24 22:37:43 +02:00
mysql_upgrade_shell.sh	Improved fix for bug#18516 (also 19353):	2006-06-22 14:28:05 +02:00
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh
mysqld_multi.sh	Manual merge of the fix for bug#16106.	2006-01-16 16:48:05 +01:00
mysqld_safe-watch.sh	Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter	2006-06-27 18:07:23 -04:00
mysqld_safe.sh	Fix for bug #17353.	2006-04-17 19:57:50 -07:00
mysqldumpslow.sh
mysqlhotcopy.sh	Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610)	2005-11-10 17:05:36 -08:00