unknown 8daa1c4229 Merge mysql.com:/home/bkroot/mysql-4.1 ... into mysql.com:/home/bk/mysql-5.0 BitKeeper/etc/config: Auto merged include/my_global.h: Auto merged sql/des_key_file.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged sql/log.cc: Manual merge sql/slave.cc: Manual merge		2005-07-13 02:13:04 +02:00
..
alias.test	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-06-27 13:12:10 +02:00
alter_table.test	After merge fixes	2005-05-14 16:24:36 +03:00
analyse.test
analyze.test	Bug #10901	2005-06-03 17:13:43 +02:00
ansi.test
archive.test	Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row.	2005-07-10 18:19:37 -07:00
auto_increment.test	Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE	2005-06-06 20:41:52 +03: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
bdb_cache-master.opt
bdb_cache.test	fix test results - Bug #11328	2005-06-16 10:09:05 +02:00
bench_count_distinct.test
bigint.test
binary.test
binlog-master.opt
binlog.test
blackhole.test
bool.test
bulk_replace.test
case.test	Merge	2005-06-23 19:05:36 +02:00
cast.test	Manual merge	2005-06-15 08:39:00 -07:00
check.test
client_xml.test
comments.test
compare.test
connect.test
consistent_snapshot.test
constraints.test
count_distinct.test	Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the	2005-05-30 03:32:50 +04:00
count_distinct2-master.opt
count_distinct2.test
count_distinct3.test
create.test	Merge	2005-06-09 17:15:06 +01:00
create_select_tmp.test
csv.test
ctype_big5.test
ctype_collate.test
ctype_cp932.test
ctype_cp1250_ch.test	ctype_cp1250_ch.result, ctype_cp1250_ch.test:	2005-06-06 21:22:23 +05:00
ctype_cp1251.test
ctype_create.test
ctype_eucjpms.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	Bug#8610: The ucs2_turkish_ci collation fails with upper('i')	2005-06-06 16:54:15 +05:00
ctype_ucs.test	Merge with 4.1	2005-07-03 14:17:52 +03:00
ctype_ucs_binlog.test
ctype_ujis.test
ctype_utf8.test	Merge mysql.com:/usr/home/bar/mysql-4.1	2005-07-12 13:18:25 +05:00
date_formats-master.opt
date_formats.test
default.test	Renamed bugs.test to default.test	2005-06-01 17:36:21 +02:00
delayed.test
delete.test	Fixed bug in multiple-table-delete where some rows was not deleted	2005-05-30 20:48:40 +03:00
derived.test
dirty_close.test
disabled.def	Disabled the GOTO feature. (It's non-standard and undocumented.)	2005-07-01 15:25:51 +02:00
distinct.test	Fix for bug #9764 (DISTINCT IFNULL truncates data)	2005-06-08 20:35:37 +05:00
drop.test
drop_temp_table.test
empty_table.test
endspace.test
errors.test
exampledb.test
explain.test
federated.test	Comment and test changes per review request by Timour. All tests pass on production with this code.	2005-05-27 22:07:46 +02:00
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	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-06-20 15:02:45 -07: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	bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.	2005-06-20 12:09:00 +02:00
func_default.test	Addition to fix for bug #11314 (test case wasn't complete)	2005-06-14 17:50:24 +05:00
func_des_encrypt.test	Fix crash caused by calling DES_ENCRYPT() without the --des-key-file	2005-07-07 11:49:44 -07:00
func_encrypt-master.opt
func_encrypt.test	BUG#10589: des_encrypt functionality always return NULL	2005-06-17 18:07:46 +02:00
func_encrypt_nossl.test	Portability fixes	2005-06-27 20:31:00 +03:00
func_equal.test
func_gconcat.test	Merge with 4.1	2005-06-07 00:31:53 +03:00
func_group.test
func_if.test	merge	2005-06-14 00:05:27 +02:00
func_in.test
func_isnull.test
func_like.test
func_math.test	Fix for bug #10632 (CEILING returns wrong result)	2005-06-15 19:53:40 +05:00
func_misc.test	BUG#9535 Warning for "create table t as select uuid();"	2005-05-17 20:31:26 +02:00
func_op.test
func_regexp.test
func_sapdb.test
func_set.test
func_str.test	Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1	2005-07-06 16:59:56 +03:00
func_system.test
func_test.test
func_time.test	backport for #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument.	2005-06-24 14:04:48 +05:00
func_timestamp.test
gcc296.test
gis-rtree.test
gis.test
grant.test	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-07-05 15:23:13 -07:00
grant2.test
grant3-master.opt
grant3.test
grant_cache.test	Resolve merge from 4.1	2005-05-18 13:54:36 -07:00
greedy_optimizer.test
group_by.test	After merge fixes	2005-07-04 16:01:04 +03:00
group_min_max.test	Fix for BUG#11044 - "SELECT DISTINCT on indexed column returns inconsistent results"	2005-06-14 12:52:44 +03:00
handler.test
having.test
heap.test	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-06-09 19:27:45 -07:00
heap_auto_increment.test
heap_btree.test
heap_hash.test	Bug#10178 - failure to find a row in heap table by concurrent UPDATEs	2005-06-24 19:47:18 +02:00
help.test
index_merge.test	Fix for BUG#10804: allow differences in rows field in EXPLAIN output	2005-06-20 11:05:38 +02:00
index_merge_bdb.test
index_merge_innodb.test	Fix for BUG#8441: in index_merge code when creating index search tuples use	2005-06-20 08:56:37 +00:00
index_merge_innodb2.test
index_merge_ror.test	Fixed failing tests for not 32 bit intel machines	2005-05-16 13:34:23 +03:00
index_merge_ror_cpk.test
information_schema.test	Merge jwinstead@production.mysql.com:my/mysql-5.0-10844	2005-07-05 15:24:35 -07:00
information_schema_db.test	Fix for bug #10659: information_schema_db fail on Mac OS	2005-05-24 14:35:23 +04:00
information_schema_inno.test	addition of "REFERENCED_TABLE_SCHEMA",	2005-05-20 16:39:28 +04:00
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	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-06-27 13:12:10 +02:00
innodb_cache-master.opt
innodb_cache.test
innodb_handler.test	bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]	2005-06-07 22:43:25 +02:00
insert.test
insert_select-binlog.test
insert_select.test	Merge with 4.1	2005-07-03 14:17:52 +03:00
insert_update.test	Merge with 4.1	2005-07-03 14:17:52 +03:00
join.test
join_crash.test
join_nested.test	join_nested.result, join_nested.test:	2005-06-15 05:56:19 -07:00
join_outer.test	join_outer.result, join_outer.test:	2005-06-15 02:02:25 -07:00
key.test	Additional tweak to fix for bug #10543, to prevent a change in	2005-06-02 10:00:36 -07:00
key_cache-master.opt
key_cache.test
key_diff.test
key_primary.test
keywords.test
kill.test
limit.test
loaddata.test
lock.test	Merge	2005-05-24 15:52:48 +01:00
lock_multi.test	BUG#9998 MySQL client hangs on "USE database"	2005-06-03 15:29:05 +02:00
lock_tables_lost_commit-master.opt
lock_tables_lost_commit.test
lowercase_table-master.opt
lowercase_table.test	Merge bk-internal.mysql.com:/data0/bk/mysql-4.1	2005-05-24 00:31:28 +02:00
lowercase_table2.test	lowercase_table2.test, lowercase_table2.result:	2005-07-05 17:27:37 +02: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	Resolve merge from 4.1	2005-05-18 13:54:36 -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
myisam-blob-master.opt
myisam-blob.test
myisam.test	Resolve merge from 4.1	2005-05-18 11:06:34 -07:00
mysql.test	BUG#9998 MySQL client hangs on "USE database"	2005-06-03 15:29:05 +02:00
mysql_client_test.test
mysql_delimiter.sql	BUG#9879 delimiter command discrepancy (4.1 vs. 5.0, mysql vs. mysqltest)	2005-05-17 21:14:01 +02:00
mysql_protocols.test
mysqlbinlog-master.opt
mysqlbinlog.test
mysqlbinlog2.test
mysqldump.test	Tests readded for bug 10927	2005-06-30 20:44:31 +02:00
mysqlshow.test
mysqltest.test	Post review fixes	2005-06-16 12:46:09 +02:00
ndb_alter_table.test	Merge with 4.1	2005-07-03 14:17:52 +03:00
ndb_autodiscover.test	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1	2005-07-12 10:57:01 +02:00
ndb_autodiscover2-master.opt
ndb_autodiscover2.test
ndb_basic.test	BUG#9626 valgrind warnings	2005-05-19 20:38:48 +02: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	Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN	2005-06-01 11:56:47 +02:00
ndb_database.test
ndb_grant.later
ndb_index.test
ndb_index_ordered.test
ndb_index_unique.test
ndb_insert.test	Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error	2005-06-17 14:45:54 +02:00
ndb_limit.test
ndb_lock.test
ndb_minmax.test
ndb_multi.test
ndb_read_multi_range.test
ndb_replace.test
ndb_restore.test	Merge mysql.com:/home/jonas/src/mysql-4.1	2005-05-24 16:50:01 +02:00
ndb_subquery.test	bug#11205 - ndb - 4006 when starting scan	2005-06-09 15:39:14 +02:00
ndb_transaction.test
ndb_truncate.test
ndb_types.test
ndb_update.test
negation_elimination.test
null.test
null_key.test
odbc.test
olap.test	view.result:	2005-07-01 03:46:08 -07:00
openssl_1.test
order_by.test
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test	After merge fixes	2005-05-14 16:24:36 +03:00
overflow.test
packet.test
preload.test
ps.test	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2005-06-27 13:12:10 +02:00
ps_1general.test	a fix (bug #11809: ps_1general.test fails on QNX).	2005-07-08 12:54:00 +05:00
ps_2myisam.test
ps_3innodb.test
ps_4heap.test	bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.	2005-06-20 12:09:00 +02:00
ps_5merge.test	bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.	2005-06-20 12:09:00 +02:00
ps_6bdb.test
ps_7ndb.test
ps_10nestset.test
ps_11bugs.test
ps_grant.test	More post-merge fixes.	2005-05-14 14:42:25 +04:00
query_cache.test	merge	2005-07-05 11:38:05 +03:00
query_cache_merge.test
raid.test
range.test	range.result, range.test:	2005-06-28 07:27:00 -07:00
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	WL#2076: Added if(...) construct to mysqltest	2005-06-16 16:56:03 +02:00
rpl_deadlock-slave.opt
rpl_deadlock.test
rpl_delete_all.test
rpl_do_grant.test
rpl_drop.test
rpl_drop_temp-slave.opt
rpl_drop_temp.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	Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes	2005-07-05 13:55:54 +02:00
rpl_insert_id-slave.opt
rpl_insert_id.test
rpl_insert_ignore-slave.opt
rpl_insert_ignore.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	BUG#9361: Added test cases	2005-06-22 17:12:02 +02:00
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_sp-master.opt
rpl_sp-slave.opt
rpl_sp.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_until.test	Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog	2005-07-04 22:27:16 +02:00
rpl_user_variables.test
rpl_variables-master.opt
rpl_variables.test	A fix (bug #10703: rpl_variables.test failure).	2005-05-18 15:10:43 +05:00
rpl_view.test
schema.test
select.test	After merge fixes	2005-07-04 03:24:25 +03:00
select_found.test
select_safe.test
show_check.test	Manual merge of BUG#11635 whihc is already in 5.0	2005-07-07 15:48:43 +02:00
skip_grants-master.opt	BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables	2005-05-26 16:44:46 +02:00
skip_grants.test	BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables	2005-05-26 16:44:46 +02:00
skip_name_resolve-master.opt
skip_name_resolve.test
sp-error.test	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-07-11 12:46:42 +02:00
sp-goto.test	Disabled the GOTO feature. (It's non-standard and undocumented.)	2005-07-01 15:25:51 +02:00
sp-security.test	- fixed the "sp-security" test case: drop any possible already existing table to	2005-07-07 17:44:10 +02:00
sp-threads.test	Fix for bug #11158 "Can't perform multi-delete in stored procedure".	2005-06-09 01:07:52 +04:00
sp.test	Merge mysql.com:/usr/local/bk/mysql-5.0	2005-07-11 12:46:42 +02:00
sp_trans.test	Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0	2005-06-07 16:48:38 +02:00
sql_mode.test	Merge mysql.com:/home/jimw/my/mysql-5.0-6903	2005-07-05 17:05:31 -07:00
status.test
strict.test	a fix (bug #6961: Traditional: assignment of string to numeric column should fail).	2005-05-13 13:22:27 +05:00
subselect.test	Fix for BUG#11821 manually merged	2005-07-12 17:11:24 +00:00
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	Merge	2005-05-07 08:25:58 -07:00
timezone-master.opt
timezone.test
timezone2.test
timezone3-master.opt
timezone3.test
timezone_grant.test
trigger.test	Manual fixes after merging patch for bug #8406 "Triggers crash if referencing	2005-07-09 23:11:17 +04:00
truncate.test
type_bit.test	a fix.	2005-06-30 13:38:29 +05:00
type_bit_innodb.test
type_blob.test	sql_table.cc:	2005-07-01 15:07:06 +05:00
type_date.test
type_datetime.test
type_decimal.test	Fix for bug #8449(Silent column changes)	2005-07-07 21:47:18 +05:00
type_enum.test
type_float.test	Fix for bug #8449(Silent column changes)	2005-07-07 21:47:18 +05:00
type_nchar.test
type_newdecimal.test	Fix for bug #11557 (Error during rounding of the DEFAULT values)	2005-07-12 14:17:59 +05:00
type_ranges.test
type_set.test
type_time.test
type_timestamp.test
type_uint.test
type_varchar.test	Fix partial keys when converting VARCHAR to TEXT. (Bug #10543)	2005-05-25 18:11:47 -07:00
type_year.test
union-master.opt
union.test	merged	2005-05-28 01:28:18 +02:00
update.test	bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.	2005-06-20 12:09:00 +02:00
user_limits.test
user_var-binlog.test
user_var.test	Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables(for 5.0)	2005-05-18 12:47:45 +05:00
varbinary.test
variables-master.opt
variables.test	Merge with 4.1	2005-07-03 14:17:52 +03:00
view.test	view.test, view.result:	2005-07-12 10:44:32 -07:00
view_grant.test	added processing of view grants to table grants (BUG#9795)	2005-07-05 13:36:36 +03:00
view_query_cache.test
warnings-master.opt
warnings.test	Merge with 4.1	2005-06-07 00:31:53 +03:00
xa.test