unknown 49e1bba346 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged BitKeeper/deleted/.del-var~62c955ccf2da1a21: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: 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 storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged		2005-07-20 07:53:10 +02:00
..
.cvsignore
fill_func_tables.sh	Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if	2005-03-22 21:52:01 +01:00
fill_help_tables.sh
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	- reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1	2005-07-08 21:04:54 +02:00
make_sharedlib_distribution.sh
make_win_binary_distribution.sh
make_win_src_distribution.sh	Merge with 4.1	2005-07-03 14:17:52 +03:00
Makefile.am	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-06-07 12:50:45 +02:00
msql2mysql.sh
mysql_config.sh	If mysql_config is a symlink, resolve it before trying to find the lib and	2005-06-24 17:59:19 -07:00
mysql_convert_table_format.sh
mysql_create_system_tables.sh	Fixed BUG#11365: Stored Procedure: Crash on Procedure operation	2005-07-08 16:33:15 +02:00
mysql_explain_log.sh
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh	Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if	2005-03-22 21:52:01 +01:00
mysql_fix_privilege_tables.sql	Merge	2005-07-12 20:01:22 +02:00
mysql_install_db.sh	Manual merge of fix for bug #9913 into 5.0 tree.	2005-05-09 16:21:57 +04:00
mysql_prepare_privilege_tables_for_5.sql
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh
mysqld_multi.sh	Added a check for config-file.	2005-04-26 17:57:14 +03:00
mysqld_safe-watch.sh
mysqld_safe.sh	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-07-19 11:05:49 -07:00
mysqldumpslow.sh
mysqlhotcopy.sh	BUG#7967 Fix mysqlhotcopy --record-log-position	2005-06-06 22:17:16 -04:00