unknown 7d74876585 Merge bk-internal:/home/bk/mysql-5.0-rpl ... into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged include/m_ctype.h: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/field.cc: Auto merged sql/item_func.cc: Auto merged		2006-10-03 14:24:43 +02:00
..
alias.result
alter_table.result
analyse.result	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305	2006-09-28 14:32:30 -04:00
analyze.result
ansi.result
archive.result
archive_gis.result
auto_increment.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
backup.result
bdb-alter-table-1.result
bdb-alter-table-2.result
bdb-crash.result
bdb-deadlock.result
bdb.result
bdb_cache.result
bdb_gis.result
bench_count_distinct.result
big_test.require
bigint.result
binary.result
binlog.result
blackhole.result
bool.result
bulk_replace.result
case.result	Merge polly.local:/tmp/20924/bug20294/my41-bug20294	2006-09-13 15:18:14 +04:00
case_sensitive_file_system.require
cast.result
check.result
check_var_limit.require
client_xml.result	Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL'	2006-09-29 16:29:39 +05:00
comments.result
compare.result	Bug #21159: Optimizer: wrong result after AND with different data types	2006-08-15 10:13:17 +03:00
compress.result
connect.result
consistent_snapshot.result
constraints.result
count_distinct.result
count_distinct2.result
count_distinct3.result
create.result	Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24	2006-09-08 13:10:14 +03:00
create_not_windows.result
create_select_tmp.result
csv.result
ctype_big5.result
ctype_collate.result
ctype_cp932.result
ctype_cp932_binlog.result
ctype_cp932_notembedded.result
ctype_cp1250_ch.result
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result
ctype_euckr.result
ctype_gb2312.result
ctype_gbk.result	Bug#21620 ALTER TABLE affects other columns	2006-09-29 16:24:11 +05:00
ctype_latin1.result
ctype_latin1_de.result
ctype_latin2.result
ctype_latin2_ch.result
ctype_many.result
ctype_mb.result
ctype_recoding.result	Merge maint2.mysql.com:/data/localhome/tsmith/bk/41	2006-09-01 08:53:56 +02:00
ctype_sjis.result
ctype_tis620.result
ctype_uca.result
ctype_ucs.result	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-09-20 09:47:36 -07:00
ctype_ucs2_def.result	mysqld --collation-server=xxx --character-set-server=yyy	2006-08-11 13:19:44 +05:00
ctype_ucs_binlog.result
ctype_ujis.result
ctype_utf8.result	Merge bk-internal:/home/bk/mysql-5.0-rpl	2006-10-03 14:24:43 +02:00
date_formats.result
default.result
delayed.result	Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID	2006-09-20 11:05:11 +02:00
delete.result	Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt	2006-09-04 18:45:48 +03:00
derived.result
dirty_close.result
distinct.result	Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456	2006-08-23 18:22:53 +03:00
drop.result	Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes	2006-08-21 12:18:59 +04:00
drop_temp_table.result
empty_table.result
endspace.result
errors.result
exampledb.result
execution_constants.result	Bug#21476: (Thread stack overrun not caught, causing SEGV)	2006-09-27 14:42:56 -04:00
explain.result
federated.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
federated_archive.result
federated_bug_13118.result
flush.result
flush_block_commit.result
flush_read_lock_kill.result
flush_table.result
foreign_key.result
fulltext.result
fulltext2.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result
fulltext_update.result
fulltext_var.result
func_compress.result
func_concat.result
func_crypt.result
func_date_add.result
func_default.result
func_des_encrypt.result
func_encrypt.result
func_encrypt_nossl.result
func_equal.result
func_gconcat.result	Fixed bug #22015: crash with GROUP_CONCAT over a derived table	2006-09-20 08:08:57 -07:00
func_group.result	fixed merge	2006-09-20 12:02:58 +03:00
func_if.result	Merge polly.local:/tmp/20924/bug20294/my41-bug20294	2006-09-13 15:18:14 +04:00
func_in.result
func_isnull.result
func_like.result
func_math.result
func_misc.result	Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41	2006-08-23 18:24:59 -06:00
func_op.result
func_regexp.result
func_sapdb.result
func_set.result
func_str.result	Post-pushbuild corrections for fix of bug #21698.	2006-09-09 09:43:09 -07:00
func_system.result
func_test.result	Merge polly.local:/tmp/20924/bug20294/my41-bug20294	2006-09-13 15:18:14 +04:00
func_time.result	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint	2006-09-28 07:30:24 -04:00
func_timestamp.result
gcc296.result
gis-rtree.result
gis.result	Merge bk-internal.mysql.com:/data0/bk/mysql-5.0	2006-08-04 19:19:26 +02:00
grant.result	Remove the fix for Bug#10668 "CREATE USER does not enforce username	2006-08-30 01:48:15 +04:00
grant2.result	Merge updates.	2006-08-10 12:39:18 -04:00
grant3.result
grant_cache.result
greedy_optimizer.result
group_by.result	Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX	2006-09-27 12:53:53 +03:00
group_min_max.result
handler.result
have_archive.require
have_bdb.require
have_big5.require
have_blackhole.require
have_compress.require
have_cp932.require
have_cp1250_ch.require
have_crypt.require
have_csv.require
have_debug.require
have_eucjpms.require
have_euckr.require
have_exampledb.require
have_federated_db.require
have_gb2312.require
have_gbk.require
have_geometry.require
have_innodb.require
have_latin2_ch.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_ndb.require
have_ndb_status_ok.require
have_openssl.require
have_outfile.require
have_perror.require
have_query_cache.require
have_raid.require
have_sjis.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_udf.require
have_udf_example.require
have_ujis.require
having.result
heap.result
heap_auto_increment.result
heap_btree.result	post-merge fix	2006-09-01 05:00:32 +02:00
heap_hash.result	Fixed bug #21698: erroneously a field could be replaced by an	2006-09-07 11:06:37 -07:00
help.result
im_daemon_life_cycle.result	Preliminary patch for the following bugs:	2006-08-29 15:46:40 +04:00
im_life_cycle.result	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	2006-08-30 00:45:33 +04:00
im_options_set.result	Preliminary patch for the following bugs:	2006-08-29 15:46:40 +04:00
im_options_unset.result	Preliminary patch for the following bugs:	2006-08-29 15:46:40 +04:00
im_utils.result	Preliminary patch for the following bugs:	2006-08-29 15:46:40 +04:00
index_merge.result	BUG#20256 - LOCK WRITE - MyISAM	2006-09-12 18:25:35 +05:00
index_merge_bdb.result
index_merge_innodb.result
index_merge_innodb2.result
index_merge_ror.result
index_merge_ror_cpk.result
information_schema.result	Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.	2006-09-06 08:21:43 -07:00
information_schema_chmod.result
information_schema_db.result	result fix	2006-08-08 12:50:05 +05:00
information_schema_inno.result
init_connect.result
init_file.result
innodb-big.result
innodb-deadlock.result
innodb-lock.result
innodb-replace.result
innodb.result
innodb_cache.result
innodb_gis.result
innodb_handler.result
innodb_mysql.result	Merge bug #16792 4.1->5.0	2006-09-05 19:07:55 +03:00
innodb_notembedded.result
innodb_unsafe_binlog.result
insert.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
insert_select-binlog.result
insert_select.result	Fix for BUG#21774: Column count doesn't match value count at row x	2006-09-12 17:50:24 +03:00
insert_update.result	Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt	2006-09-15 14:14:38 +02:00
is_debug_build.require
isam.result
join.result
join_crash.result
join_nested.result
join_outer.result	Fixed bug #16081: row equalities were not taken into	2006-09-01 04:23:04 -07:00
key.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
key_cache.result
key_diff.result
key_primary.result
keywords.result
kill.result
limit.result	Merge timka@10.100.64.80:/home/timka/mysql/src/4.1-bug-21787	2006-09-01 14:29:27 +02:00
loaddata.result
loaddata_autocom_innodb.result	Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".	2006-09-05 16:52:05 +02:00
loaddata_autocom_ndb.result	Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".	2006-09-05 16:52:05 +02:00
lock.result
lock_multi.result
lock_tables_lost_commit.result
lowercase0.require
lowercase2.require
lowercase_fs_off.result
lowercase_table.result
lowercase_table2.result
lowercase_table3.result
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_view.result
merge.result	Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines	2006-09-29 00:00:27 +05:00
metadata.result
mix_innodb_myisam_binlog.result
multi_statement.result
multi_update.result
myisam-blob.result
myisam.result	Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl	2006-09-23 05:58:48 +02:00
mysql.result	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618	2006-09-14 09:21:09 -04:00
mysql_client_test.result
mysql_protocols.result
mysqlbinlog.result
mysqlbinlog2.result
mysqlcheck.result
mysqldump-max.result
mysqldump.result	Fix of result files from merge	2006-09-21 00:59:48 +02:00
mysqlshow.result
mysqltest.result	Bug#21476: (Thread stack overrun not caught, causing SEGV)	2006-09-27 14:42:56 -04:00
ndb_alter_table.result
ndb_alter_table2.result
ndb_autodiscover.result
ndb_autodiscover2.result
ndb_autodiscover3.result
ndb_basic.result
ndb_bitfield.result
ndb_blob.result
ndb_cache.result
ndb_cache2.result
ndb_cache_multi.result
ndb_cache_multi2.result
ndb_charset.result
ndb_condition_pushdown.result	ndb_condition_pushdown.result:	2006-08-17 18:50:53 +04:00
ndb_config.result
ndb_database.result
ndb_default_cluster.require
ndb_gis.result
ndb_grant.result
ndb_index.result
ndb_index_ordered.result
ndb_index_unique.result
ndb_insert.result
ndb_limit.result
ndb_load.result
ndb_loaddatalocal.result
ndb_lock.result	Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1	2006-08-15 13:37:39 +02:00
ndb_minmax.result
ndb_multi.result
ndb_read_multi_range.result
ndb_rename.result
ndb_replace.result
ndb_restore.result
ndb_subquery.result
ndb_transaction.result
ndb_trigger.result
ndb_truncate.result
ndb_types.result
ndb_update.result
negation_elimination.result
not_as_root.require
not_embedded.require
not_embedded_server.result
not_openssl.require
null.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
null_key.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
odbc.result
olap.result	Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.	2006-09-06 08:21:43 -07:00
openssl_1.result	Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both	2006-08-22 14:29:48 +02:00
openssl_2.result
order_by.result	Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join	2006-08-15 15:48:49 +03:00
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
perror.result
preload.result
ps.result	Post-merge corrections.	2006-09-19 12:18:24 -07:00
ps_1general.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1	2006-08-02 16:48:17 +04:00
ps_2myisam.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
ps_3innodb.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
ps_4heap.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
ps_5merge.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
ps_6bdb.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
ps_7ndb.result	bug#6147 - fixing ndb test results (forgot to include into the main commit)	2006-10-02 14:17:41 +05:00
ps_10nestset.result
ps_11bugs.result
ps_grant.result
query_cache.result	merge fixes	2006-09-18 12:14:27 +02:00
query_cache_merge.result
query_cache_notembedded.result
raid.result
range.result	Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.	2006-09-06 08:21:43 -07:00
read_only.result
rename.result
repair.result	BUG#10974 - No error message if merge table based on union of innodb, memory	2006-09-20 01:40:59 +05:00
replace.result
rollback.result
round.result
row.result	Fixed bug #16081: row equalities were not taken into	2006-09-01 04:23:04 -07:00
rowid_order_bdb.result
rowid_order_innodb.result
rpl000001.a.result
rpl000001.b.result
rpl000001.result
rpl000002.result
rpl000004.a.result
rpl000004.b.result
rpl000004.result
rpl000005.result
rpl000006.result
rpl000008.result
rpl000009.result
rpl000010.result
rpl000011.result
rpl000012.result
rpl000013.result
rpl000015.result
rpl000017.result
rpl000018.result
rpl_alter.result
rpl_auto_increment.result
rpl_auto_increment_11932.result
rpl_chain_temp_table.result
rpl_change_master.result
rpl_charset.result
rpl_commit_after_flush.result
rpl_create_database.result
rpl_ddl.result
rpl_deadlock.result
rpl_delete_all.result
rpl_do_grant.result
rpl_drop.result
rpl_drop_db.result
rpl_drop_temp.result
rpl_dual_pos_advance.result
rpl_EE_error.result
rpl_empty_master_crash.result
rpl_error_ignored_table.result
rpl_failed_optimize.result
rpl_failsafe.result
rpl_flush_log_loop.result
rpl_flush_tables.result
rpl_free_items.result
rpl_get_lock.result
rpl_heap.result
rpl_ignore_grant.result
rpl_ignore_revoke.result
rpl_ignore_table.result
rpl_init_slave.result
rpl_innodb.result
rpl_insert_id.result	BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID	2006-10-02 14:28:23 +04:00
rpl_insert_ignore.result
rpl_insert_select.result
rpl_loaddata.result
rpl_loaddata_rule_m.result
rpl_loaddata_rule_s.result
rpl_loaddatalocal.result
rpl_log.result
rpl_log_pos.result
rpl_many_optimize.result
rpl_master_pos_wait.result
rpl_max_relay_size.result	After merge fixes	2006-09-21 13:38:01 +02:00
rpl_misc_functions.result
rpl_multi_delete.result
rpl_multi_delete2.result
rpl_multi_query.result
rpl_multi_update.result
rpl_multi_update2.result
rpl_multi_update3.result
rpl_multi_update4.result
rpl_mystery22.result
rpl_ndb_innodb_trans.result	Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".	2006-09-05 16:52:05 +02:00
rpl_openssl.result
rpl_optimize.result
rpl_ps.result
rpl_redirect.result
rpl_relayrotate.result
rpl_relayspace.result
rpl_replicate_do.result
rpl_reset_slave.result
rpl_rewrite_db.result
rpl_rotate_logs.result
rpl_server_id1.result
rpl_server_id2.result
rpl_session_var.result
rpl_set_charset.result
rpl_skip_error.result
rpl_slave_status.result
rpl_sp.result
rpl_sp_effects.result
rpl_sporadic_master.result
rpl_start_stop_slave.result
rpl_temporary.result
rpl_timezone.result
rpl_trigger.result
rpl_trunc_temp.result
rpl_until.result
rpl_user_variables.result
rpl_variables.result
rpl_view.result	Fix of result files from merge	2006-09-21 00:59:48 +02:00
schema.result
select.result	Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2	2006-09-29 16:40:18 +05:00
select_found.result
select_safe.result
server_id.require
server_id1.require
show_check.result
skip_grants.result
skip_name_resolve.result
slave-running.result
slave-stopped.result
sp-big.result
sp-code.result
sp-destruct.result
sp-dynamic.result
sp-error.result	Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains	2006-08-25 15:51:29 +02:00
sp-prelocking.result
sp-security.result
sp-threads.result
sp-vars.result
sp.result	Merge bk-internal:/home/bk/mysql-5.0-opt	2006-09-18 12:20:20 +02:00
sp_notembedded.result
sp_trans.result
sql_mode.result
ssl.result
ssl_compress.result
status.result
strict.result	Merge bk-internal:/home/bk/mysql-5.0-rpl	2006-10-03 14:24:43 +02:00
strict_autoinc_1myisam.result	Bug#20573	2006-08-30 13:20:39 -07:00
strict_autoinc_2innodb.result	Bug#20573	2006-08-30 13:20:39 -07:00
strict_autoinc_3heap.result	Bug#20573	2006-08-30 13:20:39 -07:00
strict_autoinc_4bdb.result	Bug#20573	2006-08-30 13:20:39 -07:00
strict_autoinc_5ndb.result	Bug#20573	2006-08-30 13:20:39 -07:00
subselect.result	Merge rurik.mysql.com:/home/igor/mysql-4.1-opt	2006-09-25 06:46:15 -07:00
subselect2.result
subselect_gis.result
subselect_innodb.result
subselect_notembedded.result
sum_distinct-big.result
sum_distinct.result
symlink.result
synchronization.result
sysdate_is_now.result
system_mysql_db.result
system_mysql_db_refs.result
tablelock.result
temp_table.result
testdb_only.require
timezone.result
timezone2.result
timezone3.result
timezone_grant.result
trigger-compat.result
trigger-grant.result
trigger-trans.result
trigger.result	Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains	2006-08-25 15:51:29 +02:00
true.require
truncate.result
type_binary.result
type_bit.result	Fix for bug #22271: data casting may affect data stored in the next column(s?)	2006-09-28 17:00:29 +05:00
type_bit_innodb.result
type_blob.result
type_date.result	Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt	2006-09-15 14:14:38 +02:00
type_datetime.result	Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.	2006-08-21 00:23:57 +04:00
type_decimal.result
type_enum.result
type_float.result	Merge polly.local:/tmp/22129/bug22129/my41-bug22129	2006-09-22 19:40:07 +04:00
type_nchar.result
type_newdecimal-big.result
type_newdecimal.result	Bug#16172 DECIMAL data type processed incorrectly	2006-08-08 14:40:07 +05:00
type_ranges.result	bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)	2006-08-10 14:50:54 +05:00
type_set.result
type_time.result
type_timestamp.result	bug #20910 (NOT NULL reported as NULL for TIMESTAMP)	2006-08-08 13:34:27 +05:00
type_uint.result
type_varchar.result	A fix for Bug#14897 "ResultSet.getString("table.column") sometimes	2006-08-30 00:38:58 +04:00
type_year.result
udf.result	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	2006-08-02 21:54:10 +04:00
union.result	Merge bug #16792 4.1->5.0	2006-09-05 19:07:55 +03:00
update.result
user_limits.result
user_var-binlog.result
user_var.result	Merge polly.local:/tmp/20924/bug20294/my50-bug20294	2006-09-13 16:06:59 +04:00
varbinary.result
variables.result	Bug #20908: Crash if select @@""	2006-08-15 18:41:21 +02:00
view.result	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl	2006-10-02 14:19:51 +02:00
view_grant.result	Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.	2006-09-06 08:21:43 -07:00
view_query_cache.result
wait_timeout.result
warnings.result	Merge bk-internal:/home/bk/mysql-5.0-rpl	2006-10-03 14:24:43 +02:00
windows.result
xa.result