unknown 8c7852ba3c Merge mysql.com:/usr/local/bk/mysql-5.0 ... into mysql.com:/usr/home/pem/mysql-5.1-new include/my_base.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/examples/ha_example.cc: Auto merged storage/myisam/ft_parser.c: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged libmysqld/Makefile.am: Manual merge. sql/ha_ndbcluster.cc: Manual merge. sql/mysqld.cc: Manual merge.		2005-11-28 20:14:12 +01:00
..
alias.test
alter_table.test
analyse.test
analyze.test
ansi.test
archive.test
archive_gis.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-deadlock.tminus
bdb.test
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
create_select_tmp.test
csv.test
ctype_big5.test
ctype_collate.test
ctype_cp932.test
ctype_cp932_binlog.test
ctype_cp1250_ch.test
ctype_cp1251.test
ctype_create.test
ctype_eucjpms.test
ctype_gbk.test
ctype_latin1.test
ctype_latin1_de-master.opt
ctype_latin1_de.test
ctype_latin2.test
ctype_many.test
ctype_mb.test
ctype_recoding.test
ctype_sjis.test
ctype_tis620.test
ctype_uca.test
ctype_ucs.test
ctype_ucs_binlog.test
ctype_ujis.test
ctype_utf8.test
date_formats-master.opt
date_formats.test
default.test
delayed.test
delete.test
derived.test
dirty_close.test
disabled.def	added missing errorcode handling in NdbIndexStat causing test failure	2005-11-24 14:57:14 +01:00
distinct.test
drop.test
drop_temp_table.test
empty_table.test
endspace.test
errors.test
exampledb.test
explain.test
federated.test
federated_archive.test
federated_bug_13118.test
federated_transactions.test
flush.test
flush_block_commit.test
flush_read_lock_kill-master.opt
flush_read_lock_kill.test
flush_table.test	Table definition cache, part 2	2005-11-23 22:45:02 +02:00
foreign_key.test
fulltext.test	Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1	2005-11-26 20:23:20 +01:00
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_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
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_sapdb.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	Merge mysql.com:/usr/home/bar/mysql-4.1.b14406	2005-11-28 15:31:11 +04:00
grant2.test
grant3-master.opt
grant3.test
grant_cache.test
greedy_optimizer.test
group_by.test
group_min_max.test	Fix bug#13293 Wrongly used index results in endless loop.	2005-11-24 19:54:02 +03:00
handler.test
having.test
heap.test
heap_auto_increment.test
heap_btree.test
heap_hash.test
help.test
im_daemon_life_cycle-im.opt
im_daemon_life_cycle.imtest
im_life_cycle.imtest
im_options_set.imtest
im_options_unset.imtest
im_utils.imtest
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
information_schema_db.test
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
innodb_cache-master.opt
innodb_cache.test
innodb_gis.test
innodb_handler.test
insert.test
insert_select-binlog.test
insert_select.test
insert_update.test
join.test
join_crash.test
join_nested.test	Remove t3 in join_nested.test	2005-11-24 19:51:52 +01:00
join_outer.test
key.test
key_cache-master.opt
key_cache.test
key_diff.test
key_primary.test
keywords.test
kill.test
kill_n_check.sh
limit.test
loaddata.test
lock.test
lock_multi.test
lock_tables_lost_commit-master.opt
lock_tables_lost_commit.test
lowercase_table-master.opt
lowercase_table.test
lowercase_table2.test
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	Table definition cache, part 2	2005-11-23 22:45:02 +02: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	Table definition cache, part 2	2005-11-23 22:45:02 +02:00
myisam-blob-master.opt
myisam-blob.test
myisam.test
mysql.test
mysql_client_test.test
mysql_delimiter.sql
mysql_delimiter_source.sql
mysql_protocols.test
mysqlbinlog-master.opt
mysqlbinlog.test
mysqlbinlog2.test
mysqlcheck.test
mysqldump-max.test
mysqldump.test	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2005-11-24 11:23:44 -08:00
mysqlshow.test
mysqltest.test
ndb_alter_table.test	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-11-28 20:14:12 +01:00
ndb_autodiscover.test
ndb_autodiscover2-master.opt
ndb_autodiscover2.test
ndb_basic.test	Merge mysql.com:/opt/local/work/mysql-4.1-root	2005-11-25 13:57:13 +03:00
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_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_lock.test
ndb_minmax.test
ndb_multi.test
ndb_partition_error.test
ndb_partition_key.test
ndb_partition_range.test
ndb_read_multi_range.test
ndb_replace.test
ndb_restore.test
ndb_subquery.test
ndb_transaction.test
ndb_truncate.test
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
partition.test
partition_error.test
partition_hash.test
partition_list.test
partition_mgm_err.test
partition_order.test
partition_range.test
preload.test
ps.test	Merge mysql.com:/opt/local/work/mysql-4.1-root	2005-11-25 13:57:13 +03: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	Table definition cache, part 2	2005-11-23 22:45:02 +02:00
query_cache_merge.test
query_cache_notembedded.test
raid.test
range.test
read_only.test
rename.test
repair.test
replace.test
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_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_init_slave-slave.opt
rpl_init_slave.test
rpl_innodb.test
rpl_insert_id-slave.opt
rpl_insert_id.test
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
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_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_until.test
rpl_user_variables.test
rpl_variables-master.opt
rpl_variables.test
rpl_view.test
schema.test
select.test	Fixed bug #15106.	2005-11-25 18:51:44 -08: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-dynamic.test	Recursion support made for SP (BUG#10100).	2005-11-23 01:11:19 +02:00
sp-error.test	Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0	2005-11-23 01:28:32 +02:00
sp-goto.test
sp-prelocking.test	added missing drop view at end of test	2005-11-24 09:56:48 +01:00
sp-security.test
sp-threads.test
sp.test	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-11-28 13:20:15 +01:00
sp_trans.test	Fixed BUG#13729 Stored procedures: packet error after exception handled	2005-11-23 11:56:53 +01:00
sql_mode.test
ssl.test
ssl_compress.test
status.test
strict.test
subselect.test
subselect2.test
subselect_gis.test
subselect_innodb.test
sum_distinct-big.test
sum_distinct.test
symlink.test
synchronization.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	Table definition cache, part 2	2005-11-23 22:45:02 +02:00
timezone-master.opt
timezone.test
timezone2.test
timezone3-master.opt
timezone3.test
timezone_grant.test
trigger-compat.test
trigger-grant.test
trigger.test	Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0	2005-11-23 01:28:32 +02: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	Moved long running query to type_newdecimal-big.test	2005-11-23 20:16:06 +02:00
type_newdecimal.test	Moved long running query to type_newdecimal-big.test	2005-11-23 20:16:06 +02:00
type_ranges.test
type_set.test
type_time.test
type_timestamp.test
type_uint.test
type_varchar.test
type_year.test
union-master.opt
union.test
update.test
user_limits.test
user_var-binlog.test
user_var.test
varbinary.test
variables-master.opt
variables.test	Merge mysql.com:/home/my/mysql-5.1	2005-11-23 22:58:53 +02:00
view.test
view_grant.test	Clear variable	2005-11-24 06:17:38 +02:00
view_query_cache.test
wait_timeout-master.opt
wait_timeout.test
warnings-master.opt
warnings.test
windows.test
xa.test