unknown 2b16d5457b Merging 4.1 into 5.0 (second pass; post-merge fixes). ... One test in subselect.test still wrong. Had to reconstruct all errmsg.txt files completely, since auto-merge made a mess of the lot. :-( mysql-test/r/sp-error.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/r/subselect.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja. :) mysql-test/r/variables.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/sp-error.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/subselect.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja :) scripts/mysql_create_system_tables.sh: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_cmpfunc.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_subselect.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_sum.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysql_priv.h: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysqld.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/danish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/dutch/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/english/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/estonian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/french/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/german/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/greek/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/hungarian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/italian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/japanese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/korean/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian-ny/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/polish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/portuguese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/russian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/serbian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/slovak/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/spanish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/swedish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/ukrainian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sp.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_base.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_cache.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_insert.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_parse.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_select.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_update.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes).		2003-07-09 17:07:12 +02:00
..
alias.test
alter_table.test
analyse.test
ansi-master.opt
ansi.test
auto_increment.test
backup-master.sh
backup.test
bdb-alter-table-1.test
bdb-alter-table-2-master.opt
bdb-alter-table-2.test
bdb-crash.test
bdb-deadlock.test
bdb.test
bdb_cache-master.opt
bdb_cache.test
bench_count_distinct.test
bigint.test
binary.test
bool.test
bulk_replace.test
case.test
cast.test
check.test
comments.test
compare.test
connect.test
constraints.test
count_distinct.test
count_distinct2-master.opt
count_distinct2.test
create.test
ctype_collate.test
ctype_latin1_de-master.opt
ctype_latin1_de.test
ctype_many.test
ctype_recoding.test
ctype_ujis.test
delayed.test
delete.test
derived.test
dirty_close.test
distinct.test
drop.test
empty_table.test
errors.test
explain.test
flush.test
flush_table.test
foreign_key.test
fulltext.test
fulltext2.test
fulltext_cache.test
fulltext_distinct.test
fulltext_left_join.test
fulltext_multi.test
fulltext_order_by.test
fulltext_update.test
fulltext_var.test
func_compress.test
func_concat.test
func_crypt.test
func_date_add.test
func_encrypt-master.opt
func_encrypt.test
func_equal.test
func_gconcat.test
func_group.test
func_if.test
func_in.test
func_isnull.test
func_like.test
func_math.test
func_misc.test
func_op.test
func_regexp.test
func_set.test
func_str.test
func_system.test
func_test.test
func_time.test
func_timestamp.test
gcc296.test
gis-rtree.test
gis.test
grant.test
grant_cache-master.opt
grant_cache.test
group_by.test
handler.test
having.test
heap.test
heap_auto_increment.test
heap_btree.test
heap_hash.test
help.test
innodb-deadlock.test
innodb.test
innodb_cache-master.opt
innodb_cache.test
innodb_handler.test
ins000001.test
insert.test
insert_select.test
insert_update.test
isam.test
join.test
join_crash.test
join_outer.test
key.test
key_diff.test
key_primary.test
keywords.test
kill.test
limit.test
loaddata.test
lock.test
lock_multi.test
lowercase_table-master.opt
lowercase_table.test
merge.test
multi_update-master.opt
multi_update.test
myisam.test
null.test
null_key.test
odbc.test
olap.test
openssl_1.test
openssl_2.test
order_by.test
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test
overflow.test
packet.test
preload.test
query_cache-master.opt
query_cache.test
raid.test
range.test
rename.test
repair_part1.test
repair_part2-master.sh
repair_part2.test
replace.test
rollback.test
row.test
rpl000001.test
rpl000002.test
rpl000004.test
rpl000005.test
rpl000006.test
rpl000008-slave.opt
rpl000008.test
rpl000009-slave.opt
rpl000009.test
rpl000010-slave.opt
rpl000010.test
rpl000011.test
rpl000012.test
rpl000013-slave.opt
rpl000013.test
rpl000015-slave.sh
rpl000015.slave-mi
rpl000015.test
rpl000017-slave.opt
rpl000017-slave.sh
rpl000017.test
rpl000018-master.opt
rpl000018-slave.opt
rpl000018.test
rpl_alter.test
rpl_empty_master_crash.test
rpl_failsafe.test
rpl_flush_log_loop-master.opt
rpl_flush_log_loop-master.sh
rpl_flush_log_loop-slave.opt
rpl_flush_log_loop-slave.sh
rpl_flush_log_loop.test
rpl_flush_tables.test
rpl_get_lock.test
rpl_insert_id.test
rpl_loaddata.test
rpl_loaddatalocal.test
rpl_log-master.opt
rpl_log.test
rpl_log_pos.test
rpl_master_pos_wait.test
rpl_misc_functions-slave.sh
rpl_misc_functions.test
rpl_mystery22.test
rpl_redirect.test
rpl_relayrotate-slave.opt
rpl_relayrotate.test
rpl_relayspace-slave.opt
rpl_relayspace.test
rpl_replicate_do-slave.opt
rpl_replicate_do.test
rpl_rotate_logs-master.opt
rpl_rotate_logs-slave.sh
rpl_rotate_logs.slave-mi
rpl_rotate_logs.test
rpl_skip_error-slave.opt
rpl_skip_error.test
rpl_sporadic_master-master.opt
rpl_sporadic_master.test
rpl_temporary.test
rpl_user_variables.test
sel000033.test
sel000100.test
select.test
select_found.test
select_safe.test
show_check.test
sp-error.test
sp.test
sql_mode.test
status.test
subselect.test
symlink.test
tablelock.test
temp_table.test
timezone-master.opt
timezone.test
truncate.test
type_blob.test
type_date.test
type_datetime.test
type_decimal.test
type_enum.test
type_float.test
type_ranges.test
type_set.test
type_time.test
type_timestamp.test
type_uint.test
type_year.test
union.test
update.test
user_var.test
varbinary.test
variables-master.opt
variables.test
warnings-master.opt
warnings.test