unknown 0fa5279543 merge with 4.0.15 ... BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-database.c~af098622e818ce0d: Auto merged BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Auto merged BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged SSL/cacert.pem: Auto merged acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlmanager/MySqlManager.dsp: Auto merged VC++Files/mysqlserver/mysqlserver.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged extra/my_print_defaults.c: Auto merged extra/resolveip.c: Auto merged include/m_string.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/os/os0file.c: Auto merged isam/_search.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/errmsg.c: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/isam.result: Auto merged mysql-test/r/loaddata.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/openssl_1.result: Auto merged mysql-test/r/packet.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/lock_tables_lost_commit-master.opt: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/openssl_1.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/default.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_pthread.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.h: Auto merged sql/net_serv.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_update.cc: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged mysql-test/t/myisam.test: merge with 4.0.15 Extra tests mysys/mf_keycache.c: Keep local file		2003-08-29 13:44:35 +03:00
..
alias.result
alter_table.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
analyse.result
ansi.result
auto_increment.result	After merge fixes	2003-08-19 00:08:08 +03:00
backup.result
bdb-alter-table-1.result
bdb-alter-table-2.result
bdb-crash.result
bdb-deadlock.result
bdb.result
bdb_cache.result
bench_count_distinct.result
big_test.require
bigint.result
binary.result
bool.result
bulk_replace.result
case.result
cast.result	CAST(expr AS CHAR(10)) is now working	2003-08-21 14:15:25 +05:00
check.result
check_var_limit.require	Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.	2003-08-22 04:07:40 +03:00
comments.result
compare.result
connect.result
constraints.result
count_distinct.result
count_distinct2.result
count_distinct3.result
create.result	fixed merge mistake	2003-08-28 10:26:56 -04:00
ctype_collate.result
ctype_cp1251.result
ctype_latin1_de.result	After merge fixes	2003-08-19 00:08:08 +03:00
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_ujis.result
delayed.result
delete.result
derived.result	fixed problem with reference on derived table fields (BUG#1031)	2003-08-12 15:04:49 +03:00
dirty_close.result
distinct.result	After merge fixes	2003-08-19 00:08:08 +03:00
drop.result	After merge fixes	2003-08-19 00:08:08 +03:00
empty_table.result
errors.result
explain.result
flush.result
foreign_key.result
fulltext.result	After merge fixes	2003-08-19 00:08:08 +03:00
fulltext2.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result
fulltext_update.result
fulltext_var.result
func_compress.result
func_concat.result
func_crypt.result
func_date_add.result
func_encrypt.result
func_equal.result
func_gconcat.result	After merge fixes	2003-08-19 00:08:08 +03:00
func_group.result
func_if.result
func_in.result
func_isnull.result
func_like.result	LIKE didn't work with non-default charset	2003-08-12 16:42:52 +05:00
func_math.result
func_misc.result
func_op.result
func_regexp.result
func_sapdb.result
func_set.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
func_str.result	After merge fixes	2003-08-19 00:08:08 +03:00
func_system.result
func_test.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
func_time.result	merge	2003-08-19 00:10:21 +03:00
func_timestamp.result
gcc296.result
gis-rtree.result
gis.result
grant.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
grant2.result
grant_cache.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
group_by.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
handler.result	After merge fixes	2003-08-19 00:08:08 +03:00
have_bdb.require
have_compress.require
have_crypt.require
have_innodb.require
have_isam.require
have_mest_timezone.require
have_openssl.require
have_openssl_1.require
have_query_cache.require
have_raid.require
have_symlink.require
have_ucs2.require
have_ujis.require
having.result
heap.result	After merge fixes	2003-08-19 00:08:08 +03:00
heap_auto_increment.result
heap_btree.result	After merge fixes	2003-08-19 00:08:08 +03:00
heap_hash.result	After merge fixes	2003-08-19 00:08:08 +03:00
help.result
innodb-deadlock.result
innodb.result	After merge fixes	2003-08-19 00:08:08 +03:00
innodb_cache.result
innodb_handler.result
ins000001.result
insert.result	After merge fixes	2003-08-19 00:08:08 +03:00
insert_select.result	After merge fixes	2003-08-19 00:08:08 +03:00
insert_update.result
isam.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
join.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
join_crash.result
join_outer.result	After merge fixes	2003-08-19 00:08:08 +03:00
key.result	After merge fixes	2003-08-19 00:08:08 +03:00
key_cache.result	After merge fixes	2003-08-19 00:08:08 +03:00
key_diff.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
key_primary.result
keywords.result
kill.result
limit.result
loaddata.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
lock.result
lock_multi.result
lock_tables_lost_commit.result
lowercase_table.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
merge.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
mix_innodb_myisam_binlog.result	2 minor edits, plus	2003-08-22 15:39:24 +02:00
multi_update.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
myisam.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
not_embedded.require
null.result	After merge fixes	2003-08-19 00:08:08 +03:00
null_key.result	After merge fixes	2003-08-19 00:08:08 +03:00
odbc.result
olap.result	Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714)	2003-08-26 20:23:48 +03:00
openssl_1.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
openssl_2.result
order_by.result	After merge fixes	2003-08-19 00:08:08 +03:00
order_fill_sortbuf.result
overflow.result
packet.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
preload.result
query_cache.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
query_cache_merge.result	Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.	2003-08-22 04:07:40 +03:00
raid.result
range.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
rename.result
repair_part1.result
repair_part2.result
replace.result
rollback.result
row.result
rpl000001.a.result
rpl000001.b.result
rpl000001.result
rpl000002.result
rpl000004.a.result
rpl000004.b.result
rpl000004.result
rpl000005.result
rpl000006.result
rpl000008.result
rpl000009.result
rpl000010.result
rpl000011.result
rpl000012.result
rpl000013.result
rpl000015.result
rpl000017.result
rpl000018.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
rpl_alter.result
rpl_do_grant.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_empty_master_crash.result
rpl_error_ignored_table.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_failsafe.result
rpl_flush_log_loop.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
rpl_flush_tables.result
rpl_get_lock.result
rpl_ignore_grant.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_insert_id.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
rpl_loaddata.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
rpl_loaddata_rule_m.result	First commit for fixing BUG#1100	2003-08-20 23:24:45 +02:00
rpl_loaddata_rule_s.result	First commit for fixing BUG#1100	2003-08-20 23:24:45 +02:00
rpl_loaddatalocal.result
rpl_log.result	Result updates after Dmitri's and my changes to logging with --log-slave-updates.	2003-08-21 00:23:39 +02:00
rpl_log_pos.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_master_pos_wait.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
rpl_max_relay_size.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_misc_functions.result
rpl_mystery22.result
rpl_redirect.result
rpl_relayrotate.result
rpl_relayspace.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
rpl_replicate_do.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_reset_slave.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_rotate_logs.result	After merge fixes	2003-08-19 00:08:08 +03:00
rpl_skip_error.result
rpl_sporadic_master.result
rpl_temporary.result
rpl_user_variables.result	After merge fixes	2003-08-19 00:08:08 +03:00
sel000033.result
sel000100.result
select.result	After merge fixes	2003-08-19 00:08:08 +03:00
select_found.result
select_safe.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
show_check.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
slave-running.result
slave-stopped.result
sql_mode.result
status.result
subselect.result	reset() split in 2 function clear() & add()	2003-08-28 03:10:14 +03:00
subselect2.result
symlink.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
tablelock.result
temp_table.result
timezone.result
truncate.result
type_blob.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_date.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
type_datetime.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
type_decimal.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_enum.result
type_float.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_ranges.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_set.result	A fix for a bug with long definition of SET or ENUM.	2003-08-19 16:35:17 +03:00
type_time.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_timestamp.result
type_uint.result	After merge fixes	2003-08-19 00:08:08 +03:00
type_year.result
union.result	merge with 4.0.15	2003-08-29 13:44:35 +03:00
update.result
user_var.result	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
varbinary.result
variables.result
warnings.result	After merge fixes	2003-08-19 00:08:08 +03:00