unknown 2c1ef3c604 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 ... into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 BitKeeper/etc/logging_ok: auto-union sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/protocol.cc: Auto merged		2005-02-23 19:22:52 +02:00
..
alias.result
alter_table.result
alter_table.result.es
analyse.result	Tests modified to coved decimal-related code	2005-02-21 19:20:05 +04:00
ansi.result
archive.result
auto_increment.result
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	Precision Math implementation	2005-02-09 02:50:45 +04:00
binary.result
bool.result
bulk_replace.result
case.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
cast.result	Tests modified to coved decimal-related code	2005-02-21 19:20:05 +04:00
check.result
check_var_limit.require
client_xml.result
comments.result
compare.result
connect.result
consistent_snapshot.result
constraints.result
count_distinct.result
count_distinct2.result	Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp &	2005-02-23 15:15:36 +03:00
count_distinct3.result
create.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
create_select_tmp.result
csv.result
ctype_big5.result
ctype_collate.result
ctype_cp932.result
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result
ctype_latin1.result	ctype_latin1.result, ctype_latin1.test, charset.c:	2005-02-22 09:56:07 +04:00
ctype_latin1_de.result	Merge mysql.com:/usr/home/bar/mysql-4.1	2005-02-18 16:14:28 +04:00
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_sjis.result	Fix error in parsing string literals containing a backslash followed	2005-02-03 16:07:32 -08:00
ctype_tis620.result
ctype_uca.result
ctype_ucs.result	Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0	2005-02-17 14:00:44 +01:00
ctype_ujis.result
ctype_utf8.result	Merge with 4.1	2005-02-22 15:47:00 +02:00
date_formats.result
delayed.result
delete.result	Manual merge	2005-02-15 21:03:17 -08:00
derived.result	Merge with 4.1	2005-02-22 15:47:00 +02:00
dirty_close.result
distinct.result	Manual merge	2005-02-11 15:00:29 -08:00
drop.result
drop_temp_table.result	Merge	2005-02-16 21:03:58 +01:00
drop_temp_table.result.es
empty_table.result
endspace.result
errors.result
exampledb.result
explain.result
federated.result
flush.result
flush_block_commit.result
flush_read_lock_kill.result
flush_table.result
foreign_key.result
fulltext.result	Merge mysql.com:/home/dellis/bkl/bug-4.1	2005-02-16 17:35:00 -06:00
fulltext2.result
fulltext_cache.result	Windows compatibility changes of the 'rpl_delete_all',	2005-02-17 02:59:39 +01:00
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_default.result
func_encrypt.result
func_equal.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
func_gconcat.result
func_group.result	Tests modified to coved decimal-related code	2005-02-21 19:20:05 +04:00
func_if.result
func_in.result
func_isnull.result
func_like.result
func_math.result
func_misc.result	Fix for BUG#7716: in in_string::set() take into account that the value returned	2005-02-04 09:14:22 +03:00
func_op.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
func_regexp.result
func_sapdb.result
func_set.result	Fixed BUILD script to use --with-berkeley-db instead of --with-bdb	2005-02-19 18:58:27 +02:00
func_str.result	Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1	2005-02-23 18:47:00 +03:00
func_system.result
func_test.result	Bug#6726 - failure to parse NOT BETWEEN	2005-02-03 23:08:43 +00:00
func_time.result
func_timestamp.result
gcc296.result
gis-rtree.result
gis.result
grant.result
grant2.result
grant_cache.result
greedy_optimizer.result
group_by.result	Merge with 4.1	2005-02-10 02:27:37 +02:00
group_min_max.result
handler.result
have_archive.require
have_bdb.require
have_big5.require
have_compress.require
have_cp932.require
have_crypt.require
have_csv.require
have_debug.require
have_eucjpms.require
have_exampledb.require
have_federated_db.require
have_geometry.require
have_innodb.require
have_isam.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_ndb.require
have_openssl.require
have_openssl_1.require
have_query_cache.require
have_raid.require
have_sjis.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_ujis.require
having.result
heap.result
heap_auto_increment.result
heap_btree.result
heap_hash.result	Merge with 4.1	2005-02-10 02:27:37 +02:00
help.result
index_merge.result
index_merge_bdb.result
index_merge_innodb.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
index_merge_innodb2.result
index_merge_ror.result
index_merge_ror_cpk.result	Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results	2005-02-22 18:30:44 +03:00
information_schema.result	Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp &	2005-02-23 15:15:36 +03:00
information_schema_inno.result
init_connect.result
innodb-deadlock.result
innodb-lock.result
innodb.result	A fix (bug #7661: 'classic' shows different test effects which must be cared for)	2005-02-21 16:39:13 +04:00
innodb.result.es
innodb_cache.result
innodb_handler.result
insert.result
insert_select.result	after merge fixes	2005-02-16 17:34:02 +01:00
insert_select.result.es	Embedded version of test fixed	2005-02-04 19:12:15 +04:00
insert_update.result	Bug#8147	2005-02-17 17:38:13 +00:00
isam.result
join.result
join_crash.result
join_nested.result
join_outer.result
key.result
key_cache.result
key_diff.result
key_primary.result
keywords.result
kill.result
limit.result	Fix for BUG#8023.	2005-02-02 08:38:24 +02:00
loaddata.result
lock.result	WL#2130: Table locking for stored FUNCTIONs	2005-02-08 20:52:50 +01:00
lock_multi.result
lock_tables_lost_commit.result
lowercase0.require
lowercase2.require
lowercase_table.result
lowercase_table2.result	Fix removal of tables from cache when the database they are contained	2005-02-08 15:14:14 -08:00
lowercase_table3.result	Fix for bug#8156:information_schema and lowercase_table3 fail on OSX	2005-02-14 18:23:10 +03:00
lowercase_table_grant.result	Clean up merge from 4.1, including making several enum fields	2005-02-17 18:07:14 -08:00
lowercase_table_qcache.result
lowercase_view.result
merge.result
metadata.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
mix_innodb_myisam_binlog.result	after merge fixes	2005-02-16 17:34:02 +01:00
multi_statement.result	Log each slow query in a multi-statement query to the slow query log.	2005-02-17 11:48:44 -08:00
multi_update.result
myisam-blob.result
myisam-blob.result.es
myisam.result	Fixed compiler warnings	2005-02-22 14:15:50 +02:00
mysql_protocols.result
mysqlbinlog.result	portability fixes	2005-02-20 20:08:33 +01:00
mysqlbinlog2.result	post-review fixes. Now ROLLBACK is done in Format_description_log_event	2005-02-17 13:52:16 +01:00
mysqldump.result	After merge fixes	2005-02-23 00:50:30 +01:00
mysqltest.result
ndb_alter_table.result
ndb_autodiscover.result	Generate warning in ha_delete_table() if files is missing in handler	2005-02-21 20:41:48 +02:00
ndb_autodiscover2.result
ndb_basic.result	small testcase update	2005-02-07 11:17:24 +01:00
ndb_bitfield.result
ndb_blob.result
ndb_cache.result	Merge of query cache from 4.1 to 5.0	2005-02-04 10:56:53 +01:00
ndb_cache2.result	BUG#8585 ndb_cache fails on aix52	2005-02-18 13:29:27 +01:00
ndb_cache_multi.result
ndb_cache_multi2.result	ndb - ndb_multi - reset query cache at end of test	2005-02-21 11:45:51 +01:00
ndb_charset.result
ndb_default_cluster.require
ndb_grant.result
ndb_index.result
ndb_index_ordered.result	ndb - fix new decimal type mysql vs. ndb	2005-02-16 21:19:42 +01:00
ndb_index_unique.result
ndb_insert.result
ndb_limit.result
ndb_lock.result
ndb_minmax.result
ndb_multi.result
ndb_read_multi_range.result
ndb_replace.result
ndb_restore.result
ndb_subquery.result
ndb_transaction.result
ndb_truncate.result
ndb_types.result
ndb_update.result
negation_elimination.result
not_embedded.require
null.result
null_key.result
odbc.result
olap.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
openssl_1.result
openssl_2.result
order_by.result
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
packet.result.es
preload.result	make LOAD INDEX to work	2005-02-12 00:05:13 +01:00
ps.result
ps_1general.result	Merge with 4.1	2005-02-22 15:47:00 +02:00
ps_2myisam.result	Things missing in last changset	2005-02-10 15:41:51 +02:00
ps_3innodb.result	Things missing in last changset	2005-02-10 15:41:51 +02:00
ps_4heap.result	Things missing in last changset	2005-02-10 15:41:51 +02:00
ps_5merge.result	Things missing in last changset	2005-02-10 15:41:51 +02:00
ps_6bdb.result	Fixed BUILD script to use --with-berkeley-db instead of --with-bdb	2005-02-19 18:58:27 +02:00
ps_7ndb.result	ndb - accept ps_7ndb.result	2005-02-17 12:13:16 +01:00
ps_10nestset.result
ps_11bugs.result
query_cache.result
query_cache.result.es
query_cache_merge.result
raid.result
range.result
rename.result
repair.result
replace.result
rollback.result
row.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
rowid_order_bdb.result
rowid_order_innodb.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
rpl_alter.result
rpl_auto_increment.result
rpl_chain_temp_table.result
rpl_change_master.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_charset.result	Merge 4.1->5.0	2005-02-22 22:40:34 +01:00
rpl_commit_after_flush.result
rpl_create_database.result
rpl_delete_all.result
rpl_do_grant.result
rpl_drop.result
rpl_drop_temp.result	1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"	2005-02-14 23:47:17 +01:00
rpl_EE_error.result	Generate warning in ha_delete_table() if files is missing in handler	2005-02-21 20:41:48 +02:00
rpl_empty_master_crash.result
rpl_error_ignored_table.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_failed_optimize.result
rpl_failsafe.result
rpl_flush_log_loop.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_flush_tables.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_free_items.result
rpl_get_lock.result
rpl_heap.result
rpl_ignore_grant.result
rpl_init_slave.result
rpl_insert_id.result
rpl_insert_ignore.result
rpl_loaddata.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_loaddata_rule_m.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_loaddata_rule_s.result
rpl_loaddatalocal.result
rpl_log.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_log_pos.result
rpl_many_optimize.result
rpl_master_pos_wait.result
rpl_max_relay_size.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_misc_functions.result
rpl_multi_delete.result
rpl_multi_delete2.result
rpl_multi_query.result	after-merge fix	2005-02-18 14:53:23 +01:00
rpl_multi_update.result
rpl_multi_update2.result
rpl_mystery22.result
rpl_openssl.result
rpl_optimize.result
rpl_ps.result
rpl_redirect.result
rpl_relayrotate.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_relayspace.result
rpl_replicate_do.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_reset_slave.result
rpl_rewrite_db.result
rpl_rotate_logs.result	Fixed compiler warnings	2005-02-22 14:15:50 +02:00
rpl_server_id1.result
rpl_server_id2.result
rpl_session_var.result
rpl_set_charset.result
rpl_skip_error.result
rpl_sporadic_master.result
rpl_start_stop_slave.result
rpl_temporary.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_timezone.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_trunc_binlog.result	fix rpl_trunc_binlog to test the new behaviour	2005-02-19 22:24:13 +01:00
rpl_until.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_user_variables.result	after merge fixes	2005-02-16 17:34:02 +01:00
rpl_view.result
schema.result
select.result	Manual merge	2005-02-17 00:34:06 -08:00
select.result.es
select_found.result
select_safe.result
server_id.require
server_id1.require
show_check.result
skip_name_resolve.result	Allow hostnames that are IP addresses with a netmask even when	2005-02-14 20:33:14 -08:00
slave-running.result
slave-stopped.result
sp-error.result	WL#2130: Table locking for stored FUNCTIONs	2005-02-08 20:52:50 +01:00
sp-security.result
sp-threads.result
sp.result	Fixed...	2005-02-18 17:39:32 +01:00
sql_mode.result	Handle backslashes correctly in strings that also have doubled quotes when	2005-02-03 16:14:02 -08:00
status.result
strict.result	After merge fixes	2005-02-22 18:30:40 +02:00
subselect.result	Tests modified to coved decimal-related code	2005-02-21 19:20:05 +04:00
subselect2.result
subselect_gis.result
subselect_innodb.result	fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it)	2005-02-06 13:06:12 +02:00
sum_distinct.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
symlink.result
synchronization.result
system_mysql_db.result	Clean up merge from 4.1, including making several enum fields	2005-02-17 18:07:14 -08:00
system_mysql_db_refs.result
tablelock.result
temp_table.result	Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp &	2005-02-23 15:15:36 +03:00
testdb_only.require
timezone.result
timezone2.result
timezone3.result
trigger.result
true.require
truncate.result
type_bit.result	A fix (bug #7661: 'classic' shows different test effects which must be cared for)	2005-02-21 16:39:13 +04:00
type_blob.result
type_blob.result.es
type_date.result	Update test result	2005-02-05 08:54:13 -08:00
type_datetime.result
type_decimal.result	Fix for BUG#8397 (second commit after review):	2005-02-22 21:58:10 +03:00
type_enum.result
type_float.result	Merge with 4.1	2005-02-22 15:47:00 +02:00
type_float.result.es	type_float.result.es updated.	2005-02-04 15:35:08 +04:00
type_nchar.result
type_newdecimal.result	Fixed BUILD script to use --with-berkeley-db instead of --with-bdb	2005-02-19 18:58:27 +02:00
type_ranges.result	Precision Math implementation	2005-02-09 02:50:45 +04:00
type_ranges.result.es	type_ranges.result.es updated.	2005-02-04 14:35:56 +04:00
type_set.result
type_time.result
type_timestamp.result
type_uint.result
type_varchar.result
type_year.result
union.result	Merge with 4.1	2005-02-15 17:12:13 +02:00
update.result	Bug#8057	2005-02-03 21:11:12 +00:00
user_limits.result
user_var.result	Merge with 4.1	2005-02-22 15:47:00 +02:00
varbinary.result
variables.result	Merge	2005-02-17 16:16:58 -08:00
view.result	postreview fix	2005-02-22 12:43:49 +02:00
view_query_cache.result
view_skip_grants.result
warnings.result	Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1	2005-02-23 20:22:51 +03:00