unknown 5177adccc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new sql/field.h: Auto merged sql/handler.h: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged		2004-12-17 18:07:05 +04:00
..
alias.test
alter_table.test	alter_table.result, alter_table.test, field_conv.cc:	2004-11-08 14:23:14 +04:00
analyse.test
ansi.test
archive.test	A few simple fixes plus the added support of being able to repair the meta data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS.	2004-12-09 01:48:07 -08:00
auto_increment.test	Fix for bug #5915 "ALTER TABLE behaves differently when converting column	2004-10-07 13:02:39 +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	Fixes to make mysql-test-run --embedded-server working	2004-12-02 16:08:17 +04:00
bdb.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
bdb_cache-master.opt
bdb_cache.test
bench_count_distinct.test
bigint.test
binary.test	Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not	2004-11-16 12:05:13 +04:00
bool.test	Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE	2004-11-27 19:26:46 +00:00
bulk_replace.test
case.test
cast.test
check.test
client_test.test	Write fatal errors even if silent is used in client_test	2004-11-11 14:59:13 +02:00
comments.test	Remove usage of !$ from mysql-tests	2004-11-02 20:13:27 +02:00
compare.test
connect.test	post-merge fix	2004-10-28 14:02:09 +03:00
consistent_snapshot.test	WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable	2004-11-10 17:56:45 +01:00
constraints.test
count_distinct.test	A fix (bug #6475: Another server crash in 5.0.2	2004-11-10 14:36:21 +04:00
count_distinct2-master.opt
count_distinct2.test
count_distinct3.test
create.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
create_select_tmp.test
csv.test
ctype_big5.test	Reuse ctype_common.inc instead of retyping	2004-11-19 14:33:55 +04:00
ctype_collate.test
ctype_cp1251-master.opt
ctype_cp1251.test
ctype_create.test
ctype_latin1.test	Bug #6737: REGEXP gives wrong result with case sensitive collation:	2004-11-22 11:58:40 +04:00
ctype_latin1_de-master.opt
ctype_latin1_de.test	After merge fixes	2004-10-07 10:50:13 +03:00
ctype_many.test
ctype_mb.test
ctype_recoding.test	Many files:	2004-11-02 16:02:12 +04:00
ctype_sjis.test	ctype_sjis.result, ctype_sjis.test, ctype-sjis.c:	2004-11-02 09:00:46 +04:00
ctype_tis620.test	Bug#6608: MySQL server crash in some query with tis620 character set.	2004-11-15 21:26:16 +04:00
ctype_uca.test	Bug#6787 LIKE not working properly with _ and utf8 data	2004-11-24 20:09:54 +04:00
ctype_ucs.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
ctype_ujis.test	ctype_ujis.result, ctype_ujis.test, field.cc:	2004-11-08 13:15:01 +04:00
ctype_utf8.test	Bug#6787 LIKE not working properly with _ and utf8 data	2004-11-24 20:09:54 +04:00
date_formats-master.opt
date_formats.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
delayed.test
delete.test	Bug#6252 - Duplicate columns in keys should fail	2004-11-22 18:07:04 +00:00
derived.test	After merge fixes	2004-10-07 10:50:13 +03:00
dirty_close.test
distinct.test
drop.test	Fixes after merge with 4.1	2004-11-03 12:39:38 +02:00
drop_temp_table.test
empty_table.test
endspace.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
errors.test
exampledb.test
explain.test
federated.test	WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony	2004-12-16 19:08:32 -08:00
flush.test
flush_block_commit.test	Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0	2004-11-30 22:22:12 +01:00
flush_read_lock_kill-master.opt	flush_read_lock_kill-master.opt:	2004-12-13 14:21:59 +01:00
flush_read_lock_kill.test	Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable	2004-12-02 23:02:38 +01:00
flush_table.test	Merge with 4.0 for 4.1 release	2004-10-06 19:14:33 +03:00
foreign_key.test
fulltext.test	bug#6784	2004-11-24 23:16:16 +01:00
fulltext2.test
fulltext_cache.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
fulltext_distinct.test
fulltext_left_join.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
fulltext_multi.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
fulltext_order_by.test	WL#964	2004-09-16 00:47:45 +06:00
fulltext_update.test
fulltext_var.test
func_compress.test	skip last compress test if we're short of RAM	2004-11-28 16:31:14 +01:00
func_concat.test	A fix (bug #5540: CONCAT function and 'double' type).	2004-09-15 15:13:17 +05:00
func_crypt.test
func_date_add.test
func_default.test
func_encrypt-master.opt
func_encrypt.test
func_equal.test
func_gconcat.test	A fix (bug #6475: Another server crash in 5.0.2	2004-11-10 14:36:21 +04:00
func_group.test	merged	2004-11-20 18:36:41 +01:00
func_if.test	Merge with 4.0 for 4.1 release	2004-10-06 19:14:33 +03:00
func_in.test	func_in.result, func_in.test:	2004-11-04 20:39:52 -08:00
func_isnull.test
func_like.test
func_math.test
func_misc.test
func_op.test
func_regexp.test
func_sapdb.test	merge with 4.1	2004-10-29 19:26:52 +03:00
func_set.test	Fix for bug #5513: FIND_IN_SET fails if set ends with a comma	2004-09-11 15:48:23 +04:00
func_str.test	Merge with 4.0	2004-11-12 20:38:58 +02:00
func_system.test
func_test.test	A fix (bug #6138: MOD operator should not round non-integral argument).	2004-10-21 19:52:55 +05:00
func_time.test	merged	2004-11-20 18:36:41 +01:00
func_timestamp.test
gcc296.test
gis-rtree.test
gis.test	Fix for bug #6117 (Centroid() crashes server)	2004-10-22 20:32:02 +05:00
grant.test	Merge with 4.1	2004-12-06 11:38:56 +02:00
grant2.test	create/drop/rename user cleanup	2004-11-27 23:07:30 +01:00
grant_cache-master.opt
grant_cache.test
greedy_optimizer.test
group_by.test
group_min_max.test	merged	2004-11-17 20:07:13 +01:00
handler.test	After merge fixes	2004-10-07 10:50:13 +03:00
having.test	WL#1972 "Evaluate HAVING before SELECT select-list"	2004-11-09 17:56:33 +02:00
heap.test	Fix test results that may change from run to run	2004-12-12 19:54:26 +02:00
heap_auto_increment.test
heap_btree.test
heap_hash.test	Fix for bug#5138 continued: added comments, removed extra debug printf calls, changed ha_heap::records_in_range to use table->rec_per_key.	2004-10-12 18:21:25 +04:00
help.test
index_merge.test
index_merge_bdb.test
index_merge_innodb.test
index_merge_innodb2.test
index_merge_ror.test
index_merge_ror_cpk.test	Fix test results	2004-12-06 01:34:19 +02:00
information_schema.test	Fix for bug#7211: information_schema: crash if bad view(after review)	2004-12-16 17:44:36 +03:00
information_schema_inno.test	Fixed bug related to lower case table names on Power Mac	2004-11-24 19:32:10 +03:00
init_connect-master.opt
init_connect.test	Enlarged group item key_length by a varstring length field.	2004-12-16 11:41:52 +01:00
init_file-master.opt
init_file.test
innodb-deadlock.test
innodb-lock.test	Fix when compiling without InnoDB	2004-10-27 18:57:49 +03:00
innodb-master.opt
innodb.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
innodb_cache-master.opt
innodb_cache.test
innodb_handler.test
insert.test	Merge with 4.1 to get new thd->mem_root handling	2004-11-08 17:53:32 +02:00
insert_select.test	Merge	2004-12-03 00:39:55 +01:00
insert_update.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
isam.test
join.test
join_crash.test
join_nested.test
join_outer.test	Merge with 4.1 to get new thd->mem_root handling	2004-11-08 17:53:32 +02:00
key.test	merged	2004-11-22 21:33:15 +01:00
key_cache-master.opt
key_cache.test	key_cache.result, key_cache.test:	2004-11-16 13:58:49 -08:00
key_diff.test
key_primary.test
keywords.test
kill.test
limit.test
loaddata.test
lock.test
lock_multi.test	Merge with 4.0 for 4.1 release	2004-10-06 19:14:33 +03:00
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_qcache-master.opt
lowercase_table_qcache.test
lowercase_view-master.opt
lowercase_view.test	fixed problem in MacOS	2004-11-24 19:48:30 +02:00
merge.test
metadata.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
mix_innodb_myisam_binlog-master.opt	Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":	2004-11-04 19:19:23 +01:00
mix_innodb_myisam_binlog.test	Merge with 4.1	2004-11-12 19:58:24 +02:00
multi_statement.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
multi_update-master.opt
multi_update.test	postreview fixes	2004-11-08 01:54:23 +02:00
myisam-blob-master.opt
myisam-blob.test
myisam.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
mysql_protocols.test	mysql_protocols.test:	2004-09-30 19:40:33 +02:00
mysqlbinlog-master.opt
mysqlbinlog.test
mysqlbinlog2.test
mysqldump.test	Merge for Matt for Innodb bug.	2004-11-30 10:10:40 -08:00
mysqltest.test	Remove usage of !$ from mysql-tests	2004-11-02 20:13:27 +02:00
ndb_alter_table.test	ndb_alter_table.result, ndb_alter_table.test:	2004-10-07 16:30:21 +00:00
ndb_autodiscover.test	added --no-defaults to ndb_drop_table in autodiscover test	2004-11-22 15:05:51 +00:00
ndb_autodiscover2-master.opt
ndb_autodiscover2.test	ndb: bug#6451	2004-11-08 11:06:36 +01:00
ndb_basic.test	Bug#6031 - To drop database you have to execute DROP DATABASE command twice.	2004-11-10 15:07:11 +00:00
ndb_blob.test	NDB blobs - try to handle insert-update-delete under autocommit=0	2004-11-03 20:21:56 +01:00
ndb_cache.test
ndb_charset.test	testcase for bug#6871, ndb, replace with collations	2004-12-01 10:13:18 +01:00
ndb_grant.later	ndb_grant.later:	2004-11-29 17:46:32 +00:00
ndb_index.test	ndb charsets (wl-1732) final part: use strxfrm + strcoll	2004-09-17 14:09:21 +02:00
ndb_index_ordered.test	ndb: bug#6435	2004-11-08 11:11:49 +01:00
ndb_index_unique.test	Merge mysql.com:/home/jonas/src/mysql-4.1-fix	2004-11-30 07:45:49 +01:00
ndb_insert.test	Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key ..	2004-11-18 12:11:56 +01:00
ndb_limit.test	bug#5782	2004-09-30 21:36:25 +00:00
ndb_lock.test	Bug#6020, any lock >= write_allow_write is a write lock	2004-10-13 10:08:18 +02:00
ndb_minmax.test
ndb_replace.test
ndb_subquery.test	adder order by	2004-10-07 08:42:11 +00:00
ndb_transaction.test
ndb_truncate.test
ndb_types.test
negation_elimination.test
null.test	Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)	2004-11-11 18:58:57 -08:00
null_key.test
odbc.test
olap.test
openssl_1.test	openssl_1.result, have_openssl_1.require, openssl_1.test:	2004-12-01 02:35:02 +01:00
order_by.test	order by group_func	2004-11-25 17:02:44 +01:00
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test	clean-up, indentation fixes.	2004-10-10 15:29:06 +05:00
overflow.test
packet.test
preload.test
ps.test	Cleanups during review stage	2004-12-02 14:43:51 +02:00
ps_1general.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
ps_2myisam.test	Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest	2004-09-25 19:08:02 +04:00
ps_3innodb.test	Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest	2004-09-25 19:08:02 +04:00
ps_4heap.test	The BIT patch by ramil causes that the old data type BIT is no	2004-12-17 14:27:39 +01:00
ps_5merge.test	The BIT patch by ramil causes that the old data type BIT is no	2004-12-17 14:27:39 +01:00
ps_6bdb.test	Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest	2004-09-25 19:08:02 +04:00
ps_7ndb.test	ps_7ndb.result, ps_7ndb.test:	2004-11-30 15:08:26 +00:00
ps_10nestset.test	Test expansion: "MOD" on non-integral first operand.	2004-11-02 15:09:57 +01:00
ps_11bugs.test	Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'.	2004-10-21 16:02:12 +02:00
query_cache.test	merge with 4.1	2004-10-29 19:26:52 +03:00
query_cache_merge.test
raid.test
range.test	post-merge	2004-11-22 22:57:05 +01:00
rename.test	After merge fixes	2004-10-07 10:50:13 +03:00
repair.test
replace.test
rollback.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
row.test
rowid_order_bdb.test
rowid_order_innodb.test
rpl000001-slave.opt
rpl000001.test	merged	2004-11-22 20:15:48 +01:00
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	Added options --auto-increment-increment and --auto-increment-offset.	2004-09-15 22:10:31 +03:00
rpl_auto_increment.test	test made independend of server builtin features	2004-11-21 16:42:54 +02:00
rpl_chain_temp_table.test
rpl_change_master.test
rpl_charset.test	After merge fixes	2004-12-06 17:15:54 +02:00
rpl_commit_after_flush.test	After merge fixes	2004-10-20 17:28:40 +03:00
rpl_create_database-master.opt	Bug#6391 (binlog-do-db rules ignored)	2004-12-03 12:13:51 +01:00
rpl_create_database-slave.opt	Bug#6391 (binlog-do-db rules ignored)	2004-12-03 12:13:51 +01:00
rpl_create_database.test	After merge fixes	2004-12-06 17:15:54 +02:00
rpl_delete_all.test
rpl_do_grant.test
rpl_drop.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	Simpler arena swapping code	2004-11-08 01:13:54 +02:00
rpl_failed_optimize.test	Fix for bug#5551 (Version 4).	2004-11-03 18:23:58 +01:00
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_insert_id-slave.opt
rpl_insert_id.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_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_update.test
rpl_mystery22.test
rpl_openssl.test
rpl_optimize.test
rpl_ps.test
rpl_redirect.test	merge with 4.1	2004-10-29 19:26:52 +03:00
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	BUG#6353 V2:	2004-11-15 17:03:54 +01:00
rpl_rewrite_db.test	BUG#6353 V2:	2004-11-15 17:03:54 +01:00
rpl_rotate_logs-master.opt
rpl_rotate_logs-slave.sh
rpl_rotate_logs.slave-mi
rpl_rotate_logs.test	post-review fixes	2004-11-12 14:34:00 +02:00
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_sporadic_master-master.opt
rpl_sporadic_master.test
rpl_start_stop_slave.test	Fix for Bug#6148. Only rewind read position in binary log when the	2004-11-25 09:26:45 +01:00
rpl_temporary.test
rpl_timezone-master.opt
rpl_timezone-slave.opt
rpl_timezone.test	post-merge fix	2004-10-28 14:02:09 +03:00
rpl_trunc_binlog.test
rpl_until.test	Merge with 4.1	2004-12-06 11:38:56 +02:00
rpl_user_variables.test	merge with 4.1	2004-10-29 19:26:52 +03:00
schema.test	Update to add keyword "SCHEMA" and "SCHEMAS". Small test case was added too.	2004-10-01 12:39:11 -07:00
select.test	merged	2004-11-28 20:42:04 +01:00
select_found.test
select_safe.test
show_check.test	Merge with 4.1 to get in latest bug fixes	2004-11-04 15:06:24 +02:00
sp-error.test	Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY	2004-11-25 16:13:06 +01:00
sp-security.test	merge	2004-10-28 11:02:48 +03:00
sp-threads.test
sp.test	merge	2004-11-12 15:36:31 +02:00
sql_mode.test	Merge with 4.1 to get in latest bug fixes	2004-11-04 15:06:24 +02:00
status.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00
strict.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
subselect.test	Merge with 4.1	2004-12-06 11:38:56 +02:00
subselect2.test
subselect_gis.test
subselect_innodb.test	postreview fixes	2004-12-04 00:14:18 +02:00
sum_distinct.test
symlink.test
synchronization.test
system_mysql_db.test
system_mysql_db_fix-master.opt
system_mysql_db_fix.test	Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test	2004-12-08 01:17:52 +02:00
system_mysql_db_refs.test
tablelock.test
temp_table.test	Remove usage of !$ from mysql-tests	2004-11-02 20:13:27 +02:00
timezone-master.opt
timezone.test
timezone2.test	Fix for bug #6116 "SET time_zone := ... requires access to	2004-10-21 22:18:00 +04:00
timezone3-master.opt	Fix for bug #6387 "Queried timestamp values do not match the inserted	2004-11-03 17:59:03 +00:00
timezone3.test	Fix for bug #6387 "Queried timestamp values do not match the inserted	2004-11-03 17:59:03 +00:00
trigger.test	Fix for bug #5888 "Triggers with nonexistent columns cause packets	2004-11-24 12:24:02 +03:00
truncate.test
type_bit.test	bit type	2004-12-17 18:06:05 +04:00
type_blob.test	Merge with new VARCHAR code	2004-12-06 19:18:35 +02:00
type_date.test
type_datetime.test	Fix for bug #6266 "Invalid DATETIME value is not handled properly".	2004-11-15 15:44:29 +03:00
type_decimal.test
type_enum.test	merged on pull	2004-12-02 14:47:14 +02:00
type_float.test	autocommit	2004-11-04 21:25:49 +05:00
type_nchar.test
type_ranges.test	Update results for new varchar handling	2004-12-07 15:47:00 +02:00
type_set.test	Bug 6206: ENUMs are not case sensitive even if declared BINARY	2004-10-26 13:17:37 +05:00
type_time.test
type_timestamp.test	Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves	2004-10-07 13:51:32 +04:00
type_uint.test
type_varchar.test	Added some tests for new varchar.	2004-12-07 21:17:00 +02:00
type_year.test
union-master.opt
union.test	Check that the third UNION part with COLLATE	2004-11-18 16:15:48 +04:00
update.test	Merge with 4.0 for 4.1 release	2004-10-06 19:14:33 +03:00
user_var.test	merged	2004-11-17 18:04:36 +01:00
varbinary.test
variables-master.opt
variables.test	Merge with 4.1 to get new thd->mem_root handling	2004-11-08 17:53:32 +02:00
view.test	Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review)	2004-12-16 16:31:36 +03:00
view_skip_grants-master.opt
view_skip_grants.test
warnings-master.opt
warnings.test	A lot of fixes for prepared statements (PS):	2004-10-26 19:30:01 +03:00