unknown 389e22c29a Merge mysql.com:/home/mydev/mysql-4.1-bug17877 ... into mysql.com:/home/mydev/mysql-5.0-bug11824 myisam/mi_key.c: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/gis-rtree.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged myisam/mi_check.c: Manual merge mysql-test/r/func_time.result: Manual merge mysql-test/t/func_time.test: Manual merge		2006-06-29 10:26:24 +02:00
..
alias.test
alter_table.test
analyse.test
analyze.test	Add missing drop table	2006-05-29 16:27:45 +02:00
ansi.test
archive.test	Manually merged	2006-06-17 02:57:50 +04:00
archive_gis.test
auto_increment.test	Manually merged	2006-06-17 02:57:50 +04:00
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-deadlock.tminus
bdb.test	Fix compilation failures on Windows caused by the patch for Bug#17199.	2006-06-27 14:56:24 +04:00
bdb_cache-master.opt
bdb_cache.test
bdb_gis.test
bench_count_distinct.test
bigint.test
binary.test
binlog-master.opt
binlog.test
blackhole.test
bool.test
bulk_replace.test
case.test
cast.test
check.test
client_xml.test
comments.test
compare.test
compress.test
connect.test
consistent_snapshot.test
constraints.test
count_distinct.test
count_distinct2-master.opt
count_distinct2.test
count_distinct3.test
create.test	A fix and a test case for	2006-06-27 00:47:52 +04:00
create_not_windows.test	BUG#19479: mysqldump creates invalid dump	2006-06-04 21:27:41 +03:00
create_select_tmp.test
csv.test
ctype_big5.test
ctype_collate.test
ctype_cp932.test
ctype_cp932_binlog.test
ctype_cp932_notembedded.test
ctype_cp1250_ch.test
ctype_cp1251.test
ctype_create.test
ctype_eucjpms.test
ctype_euckr.test
ctype_gb2312.test
ctype_gbk.test
ctype_latin1.test
ctype_latin1_de-master.opt
ctype_latin1_de.test
ctype_latin2.test
ctype_latin2_ch.test
ctype_many.test
ctype_mb.test
ctype_recoding.test
ctype_sjis.test
ctype_tis620.test
ctype_uca.test
ctype_ucs.test
ctype_ucs2_def-master.opt	Bug#15276: MySQL ignores collation-server	2006-06-23 18:00:49 +05:00
ctype_ucs2_def.test	Bug#15276: MySQL ignores collation-server	2006-06-23 18:00:49 +05:00
ctype_ucs_binlog.test
ctype_ujis.test
ctype_utf8.test	Fixed bug #14896.	2006-06-22 00:29:04 +04:00
date_formats-master.opt
date_formats.test
default.test
delayed.test	Bug #20195: INSERT DELAYED with auto_increment is assigned wrong values	2006-06-13 18:18:32 +03:00
delete.test
derived.test
dirty_close.test
disabled.def
distinct.test
drop.test
drop_temp_table.test
empty_table.test
endspace.test
errors.test
exampledb.test
explain.test	Merge rurik.mysql.com:/home/igor/tmp_merge	2006-05-31 18:10:02 -07:00
federated.test	Merge mysql.com:/home/mydev/mysql-5.0-amerge	2006-06-29 10:18:29 +02:00
federated_archive.test
federated_bug_13118.test
flush.test
flush_block_commit.test
flush_read_lock_kill-master.opt
flush_read_lock_kill.test
flush_table.test
foreign_key.test
fulltext.test
fulltext2.test
fulltext_cache.test
fulltext_distinct.test
fulltext_left_join.test	Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index	2006-06-16 09:49:18 +02:00
fulltext_multi.test
fulltext_order_by.test
fulltext_update.test
fulltext_var.test
func_compress.test
func_concat.test	Manually merged	2006-06-14 23:54:08 +04:00
func_crypt.test
func_date_add.test
func_default.test
func_des_encrypt.test
func_encrypt-master.opt
func_encrypt.test
func_encrypt_nossl.test
func_equal.test
func_gconcat.test
func_group.test	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-06-15 18:40:18 -07:00
func_if.test
func_in.test	Merge	2006-06-20 00:52:26 +04:00
func_isnull.test
func_like.test
func_math.test
func_misc.test
func_op.test
func_regexp.test
func_sapdb.test	Merge mysql.com:/home/mydev/mysql-4.1-bug17877	2006-06-29 10:26:24 +02:00
func_set.test
func_str.test	Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt	2006-06-17 01:57:25 +04:00
func_system.test
func_test.test
func_time.test	Merge mysql.com:/home/mydev/mysql-4.1-bug17877	2006-06-29 10:26:24 +02:00
func_timestamp.test	#19409: Test 'func_timestamp' fails on Windows x64	2006-06-22 20:50:38 +02:00
gcc296.test
gis-rtree.test	Merge mysql.com:/home/mydev/mysql-4.1-bug17877	2006-06-29 10:26:24 +02:00
gis.test	merging fix	2006-06-27 17:00:24 +05:00
grant.test	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2006-05-29 15:06:37 +02:00
grant2.test
grant3-master.opt
grant3.test
grant_cache.test
greedy_optimizer.test
group_by.test
group_min_max.test
handler.test
having.test
heap.test
heap_auto_increment.test
heap_btree.test
heap_hash.test
help.test
im_daemon_life_cycle-im.opt	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
im_daemon_life_cycle.imtest	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
im_life_cycle-im.opt	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
im_life_cycle.imtest	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
im_options_set.imtest
im_options_unset.imtest
im_utils-im.opt	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
im_utils.imtest	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
index_merge.test
index_merge_bdb.test
index_merge_innodb.test
index_merge_innodb2.test
index_merge_ror.test
index_merge_ror_cpk.test
information_schema.test	Bug#18035 Information Schema: Output is not Sorted	2006-06-06 12:57:50 +05:00
information_schema_chmod.test
information_schema_db.test	Bug#17204 "second CALL to procedure crashes Server"	2006-05-30 10:45:23 +05:00
information_schema_inno.test
init_connect-master.opt
init_connect.test
init_file-master.opt
init_file.test
innodb-big.test
innodb-deadlock.test
innodb-lock.test
innodb-master.opt
innodb-replace.test
innodb.test	Applied innodb-5.0-ss609 snapshot.	2006-06-06 23:37:42 +04:00
innodb_cache-master.opt
innodb_cache.test
innodb_gis.test
innodb_handler.test
innodb_mysql.test
innodb_notembedded.test
innodb_unsafe_binlog-master.opt
innodb_unsafe_binlog.test
insert.test	Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and	2006-06-16 20:21:25 +04:00
insert_select-binlog.test
insert_select.test	merge of the changes for bug #18080	2006-06-21 13:03:06 +03:00
insert_update.test
join.test	Bug #15355: Common natural join column not resolved in prepared statement nested	2006-06-08 13:34:03 +03:00
join_crash.test
join_nested.test
join_outer.test
key.test	Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql	2006-06-23 14:53:41 +04:00
key_cache-master.opt
key_cache.test
key_diff.test
key_primary.test
keywords.test
kill.test
kill_n_check.sh	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
limit.test
loaddata.test
lock.test
lock_multi.test	Bug#16986 - Deadlock condition with MyISAM tables	2006-06-26 19:14:35 +02:00
lock_tables_lost_commit-master.opt
lock_tables_lost_commit.test
lowercase_table-master.opt
lowercase_table.test
lowercase_table2.test	Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1	2006-06-06 11:25:31 +05:00
lowercase_table3-master.opt
lowercase_table3.test
lowercase_table_grant-master.opt
lowercase_table_grant.test
lowercase_table_qcache-master.opt
lowercase_table_qcache.test
lowercase_view-master.opt
lowercase_view.test
merge.test	Bug#19648	2006-05-30 17:10:53 -07:00
metadata.test
mix_innodb_myisam_binlog-master.opt
mix_innodb_myisam_binlog.test
multi_statement-master.opt
multi_statement.test
multi_update-master.opt
multi_update.test	Manually merged	2006-05-29 19:07:35 +04:00
myisam-blob-master.opt
myisam-blob.test
myisam.test	Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1	2006-06-21 19:41:09 +05:00
mysql.test
mysql_client_test.opt
mysql_client_test.test
mysql_delimiter.sql
mysql_delimiter_source.sql
mysql_protocols.test
mysqlbinlog-master.opt
mysqlbinlog.test	Bug#14157: utf8 encoding in binlog without set character_set_client	2006-05-31 19:49:38 +02:00
mysqlbinlog2.test
mysqlcheck.test
mysqldump-max.test
mysqldump.test	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint	2006-06-26 19:44:27 +02:00
mysqlshow.test
mysqltest.test
ndb_alter_table.test
ndb_alter_table2.test
ndb_autodiscover.test
ndb_autodiscover2-master.opt
ndb_autodiscover2.test
ndb_autodiscover3.test
ndb_basic.test
ndb_bitfield.test
ndb_blob.test
ndb_cache.test
ndb_cache2.test
ndb_cache_multi.test
ndb_cache_multi2.test
ndb_charset.test
ndb_condition_pushdown.test	ndb - bug#20406 multi-platform testing - not FIX	2006-06-14 00:38:34 +02:00
ndb_config.test
ndb_database.test
ndb_gis.test
ndb_grant.later
ndb_index.test
ndb_index_ordered.test
ndb_index_unique.test
ndb_insert.test
ndb_limit.test
ndb_load.test
ndb_loaddatalocal.test	Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL	2006-06-14 20:16:32 +02:00
ndb_lock.test	Added order by	2006-06-12 15:36:12 +02:00
ndb_minmax.test
ndb_multi.test
ndb_read_multi_range.test
ndb_rename.test
ndb_replace.test	Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly	2006-06-21 09:36:50 +02:00
ndb_restore.test
ndb_subquery.test
ndb_transaction.test
ndb_truncate.test	Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table	2006-06-02 07:26:45 +02:00
ndb_types.test
ndb_update.test
negation_elimination.test
not_embedded_server-master.opt
not_embedded_server.test
null.test
null_key.test
odbc.test
olap.test
openssl_1.test
order_by.test
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test
overflow.test
packet.test
preload.test
ps.test	A fix and a test case for	2006-06-27 00:47:52 +04:00
ps_1general.test
ps_2myisam.test
ps_3innodb.test
ps_4heap.test
ps_5merge.test
ps_6bdb.test
ps_7ndb.test
ps_10nestset.test
ps_11bugs.test
ps_grant.test
query_cache.test
query_cache_merge.test
query_cache_notembedded.test
raid.test
range.test
read_only.test
rename.test
repair.test
replace.test	Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.	2006-06-07 16:17:56 +04:00
rollback.test
row.test
rowid_order_bdb.test
rowid_order_innodb.test
rpl000001-slave.opt
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_auto_increment-master.opt
rpl_auto_increment.test
rpl_auto_increment_11932.test
rpl_chain_temp_table.test
rpl_change_master.test
rpl_charset.test
rpl_commit_after_flush.test
rpl_create_database-master.opt
rpl_create_database-slave.opt
rpl_create_database.test
rpl_ddl.test
rpl_deadlock-slave.opt
rpl_deadlock.test
rpl_delete_all.test
rpl_do_grant.test
rpl_drop.test
rpl_drop_db.test
rpl_drop_temp-slave.opt
rpl_drop_temp.test
rpl_dual_pos_advance-master.opt
rpl_dual_pos_advance.test
rpl_EE_error.test
rpl_empty_master_crash.test
rpl_error_ignored_table-slave.opt
rpl_error_ignored_table.test
rpl_failed_optimize-master.opt
rpl_failed_optimize.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_free_items-slave.opt
rpl_free_items.test
rpl_get_lock.test
rpl_heap.test
rpl_ignore_grant-slave.opt
rpl_ignore_grant.test
rpl_ignore_revoke-slave.opt
rpl_ignore_revoke.test
rpl_ignore_table-slave.opt
rpl_ignore_table.test
rpl_init_slave-slave.opt
rpl_init_slave.test
rpl_innodb.test
rpl_insert_id-slave.opt
rpl_insert_id.test	Avoid race between master and slave.	2006-05-29 14:45:20 +04:00
rpl_insert_ignore-slave.opt
rpl_insert_ignore.test
rpl_insert_select.test
rpl_loaddata.test
rpl_loaddata_rule_m-master.opt
rpl_loaddata_rule_m.test
rpl_loaddata_rule_s-slave.opt
rpl_loaddata_rule_s.test
rpl_loaddatalocal.test
rpl_log-master.opt
rpl_log-slave.opt
rpl_log.test	Manually merged	2006-06-17 02:57:50 +04:00
rpl_log_pos.test
rpl_many_optimize.test
rpl_master_pos_wait.test
rpl_max_relay_size.test
rpl_misc_functions-slave.sh
rpl_misc_functions.test
rpl_multi_delete-slave.opt
rpl_multi_delete.test
rpl_multi_delete2-slave.opt
rpl_multi_delete2.test
rpl_multi_query.test
rpl_multi_update.test
rpl_multi_update2-slave.opt
rpl_multi_update2.test
rpl_multi_update3.test
rpl_multi_update4-slave.opt
rpl_multi_update4.test
rpl_mystery22.test
rpl_openssl.test
rpl_optimize.test
rpl_ps.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_reset_slave.test
rpl_rewrite_db-slave.opt
rpl_rewrite_db.test
rpl_rotate_logs-master.opt
rpl_rotate_logs-slave.sh
rpl_rotate_logs.slave-mi
rpl_rotate_logs.test
rpl_server_id1.test
rpl_server_id2-slave.opt
rpl_server_id2.test
rpl_session_var.test
rpl_set_charset.test
rpl_skip_error-slave.opt
rpl_skip_error.test
rpl_slave_status.test
rpl_sp-master.opt
rpl_sp-slave.opt
rpl_sp.test
rpl_sp_effects-master.opt
rpl_sp_effects-slave.opt
rpl_sp_effects.test
rpl_sporadic_master-master.opt
rpl_sporadic_master.test
rpl_start_stop_slave.test
rpl_temporary.test
rpl_timezone-master.opt
rpl_timezone-slave.opt
rpl_timezone.test
rpl_trigger.test
rpl_trunc_temp.test
rpl_until.test
rpl_user_variables.test
rpl_variables-master.opt
rpl_variables.test
rpl_view-slave.opt
rpl_view.test
schema.test
select.test	field.cc, field.h:	2006-06-21 01:14:53 +04:00
select_found.test
select_safe.test
show_check.test
skip_grants-master.opt
skip_grants.test
skip_name_resolve-master.opt
skip_name_resolve.test
sp-big.test
sp-code.test
sp-destruct.test
sp-dynamic.test
sp-error.test
sp-prelocking.test	Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored	2006-06-21 01:50:20 +04:00
sp-security.test	Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w	2006-06-28 12:40:17 +02:00
sp-threads.test
sp-vars.test
sp.test	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime	2006-06-27 00:52:56 +04:00
sp.test.orig
sp_notembedded.test
sp_trans.test
sql_mode.test
ssl.test
ssl_compress.test
status.test
strict.test
subselect.test	Bug #19700: subselect returning BIGINT always returned it as SIGNED	2006-05-25 10:39:18 +03:00
subselect2.test
subselect_gis.test
subselect_innodb.test
subselect_notembedded.test
sum_distinct-big.test
sum_distinct.test
symlink.test
synchronization.test
sysdate_is_now-master.opt
sysdate_is_now.test
system_mysql_db.test
system_mysql_db_fix-master.opt
system_mysql_db_fix.test
system_mysql_db_refs.test
tablelock.test
temp_table-master.opt
temp_table.test
timezone-master.opt
timezone.test
timezone2.test
timezone3-master.opt
timezone3.test
timezone_grant.test
trigger-compat.test
trigger-grant.test
trigger-trans.test
trigger.test	Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and	2006-06-16 20:21:25 +04:00
truncate.test
type_binary.test
type_bit.test
type_bit_innodb.test
type_blob.test
type_date.test
type_datetime.test
type_decimal.test
type_enum.test
type_float.test
type_nchar.test
type_newdecimal-big.test
type_newdecimal.test	Fix for bug#19667 group by a decimal expression yields wrong result	2006-06-15 16:24:02 +05:00
type_ranges.test
type_set.test
type_time.test
type_timestamp.test	#19409: Test 'func_timestamp' fails on Windows x64	2006-06-22 20:50:38 +02:00
type_uint.test
type_varchar.test
type_year.test
udf.test	Bug#19904: UDF: not initialized *is_null per row	2006-06-08 13:25:28 -04:00
union-master.opt
union.test	Fixed bug#18175: The nest_level counter wasn't decremented for union parts which	2006-06-15 22:09:58 +04:00
update.test
user_limits.test
user_var-binlog.test
user_var.test
varbinary.test
variables.test	Additional test for Bugs#20392: INSERT_ID session variable has weird value	2006-06-22 19:40:59 +05:00
view.test	Post-merge fixes	2006-05-31 22:55:45 -07:00
view_grant.test	manual merge	2006-06-21 13:01:00 +03:00
view_query_cache.test
wait_for_process.sh	Fix of test suite in scope of fixing BUG#18023: IM: instance	2006-06-19 14:13:34 +04:00
wait_timeout-master.opt
wait_timeout.test	Fix race condition in test case wait_timeout.	2006-06-24 13:11:09 +02:00
warnings-master.opt
warnings.test
windows.test
xa.test