mariadb/mysql-test/r
unknown 9767b63788 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
2005-10-12 15:31:00 +02:00
..
alias.result
alter_table.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
analyse.result
analyze.result
ansi.result
archive.result
auto_increment.result
backup.result
bdb-alter-table-1.result
bdb-alter-table-2.result
bdb-crash.result
bdb-deadlock.result
bdb.result Adjust test results changed because of fix for BUG#13455 2005-09-30 07:06:04 +04:00
bdb_cache.result
bench_count_distinct.result
big_test.require
bigint.result
binary.result
binlog.result
blackhole.result
bool.result
bulk_replace.result
case.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
cast.result Correct merge error, warning ended up after new tests from 4.1 2005-09-28 13:29:13 +02:00
check.result
check_var_limit.require
client_xml.result
comments.result
compare.result
connect.result
consistent_snapshot.result
constraints.result
count_distinct.result
count_distinct2.result
count_distinct3.result
create.result
create_select_tmp.result
csv.result
ctype_big5.result Bug#13046: LIKE pattern matching using prefix 2005-09-21 23:10:51 +05:00
ctype_collate.result
ctype_cp932.result Bug#13046: LIKE pattern matching using prefix 2005-09-21 23:10:51 +05:00
ctype_cp1250_ch.result
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result
ctype_gbk.result Bug#13046: LIKE pattern matching using prefix 2005-09-21 23:10:51 +05:00
ctype_latin1.result Bug#13046: LIKE pattern matching using prefix 2005-09-21 23:10:51 +05:00
ctype_latin1_de.result
ctype_latin2.result
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_sjis.result Bug#13046: LIKE pattern matching using prefix 2005-09-21 23:10:51 +05:00
ctype_tis620.result Merge msdesk.(none):/home/msvensson/mysql-4.1 2005-10-06 14:40:18 +02:00
ctype_uca.result Merge msdesk.(none):/home/msvensson/mysql-4.1 2005-10-06 14:40:18 +02:00
ctype_ucs.result Merge msdesk.(none):/home/msvensson/mysql-4.1 2005-10-06 14:40:18 +02:00
ctype_ucs_binlog.result Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
ctype_ujis.result Merge msdesk.(none):/home/msvensson/mysql-4.1 2005-10-06 14:40:18 +02:00
ctype_utf8.result Reviewing new pushed code 2005-10-12 00:58:22 +03:00
date_formats.result
default.result test case fixed to pass w/o innodb 2005-09-25 15:44:05 +02:00
delayed.result
delete.result
derived.result
dirty_close.result
distinct.result
drop.result
drop_temp_table.result
empty_table.result
endspace.result
errors.result
exampledb.result
explain.result
federated.result BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE 2005-10-10 17:41: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
func_group.result Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-09-23 09:18:56 +02:00
func_if.result
func_in.result Manually merged 2005-09-24 02:39:52 +04:00
func_isnull.result
func_like.result
func_math.result
func_misc.result
func_op.result
func_regexp.result
func_sapdb.result
func_set.result
func_str.result Reviewing new pushed code 2005-10-12 00:58:22 +03:00
func_system.result
func_test.result
func_time.result
func_timestamp.result
gcc296.result
gis-rtree.result
gis.result
grant.result
grant2.result
grant3.result
grant_cache.result
greedy_optimizer.result
group_by.result
group_min_max.result test case fixed to pass w/o innodb 2005-09-25 15:44:05 +02:00
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_exampledb.require
have_federated_db.require
have_gbk.require
have_geometry.require
have_innodb.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_ndb.require
have_openssl.require
have_openssl_1.require
have_outfile.require
have_query_cache.require
have_raid.require
have_sjis.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_ujis.require
having.result
heap.result Fix for BUG#13455: Make "ref" optimizer able to make this inference: 2005-09-30 01:34:19 +04:00
heap_auto_increment.result
heap_btree.result
heap_hash.result
help.result
im_daemon_life_cycle.result WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-10-01 01:14:50 +04:00
im_life_cycle.result WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-10-01 01:14:50 +04:00
im_options_set.result WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-10-01 01:14:50 +04:00
im_options_unset.result WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-10-01 01:14:50 +04:00
im_utils.result WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-10-01 01:14:50 +04:00
index_merge.result
index_merge_bdb.result
index_merge_innodb.result BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function 2005-10-01 11:56:01 +04:00
index_merge_innodb2.result
index_merge_ror.result
index_merge_ror_cpk.result
information_schema.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
information_schema_db.result
information_schema_inno.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
init_connect.result
innodb-big.result
innodb-deadlock.result
innodb-lock.result
innodb-replace.result
innodb.result innodb.result: 2005-10-04 21:37:50 +02:00
innodb_cache.result
innodb_handler.result
insert.result
insert_select-binlog.result
insert_select.result
insert_update.result
isam.result
join.result
join_crash.result
join_nested.result fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
join_outer.result
key.result
key_cache.result
key_diff.result
key_primary.result
keywords.result
kill.result
limit.result
loaddata.result Merge from 4.1 to 5.0 2005-09-23 14:37:22 +02:00
lock.result
lock_multi.result
lock_tables_lost_commit.result
lowercase0.require
lowercase2.require
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/mydev/mysql-4.1-4100 2005-09-29 14:07:32 +02:00
metadata.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
mix_innodb_myisam_binlog.result
multi_statement.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
multi_update.result
myisam-blob.result
myisam.result Fix for BUG#13455: Make "ref" optimizer able to make this inference: 2005-09-30 01:34:19 +04:00
mysql.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
mysql_protocols.result
mysqlbinlog.result Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
mysqlbinlog2.result Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
mysqldump-max.result BUG #7815 2005-09-26 22:43:09 -07:00
mysqldump.result Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-08 03:37:23 +03:00
mysqlshow.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
mysqltest.result Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-30 16:51:35 +02:00
ndb_alter_table.result Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 2005-09-22 09:10:11 +02:00
ndb_autodiscover.result
ndb_autodiscover2.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_config.result postt review fixes 2005-10-12 15:19:51 +02:00
ndb_database.result
ndb_default_cluster.require
ndb_grant.result
ndb_index.result
ndb_index_ordered.result
ndb_index_unique.result
ndb_insert.result
ndb_limit.result
ndb_lock.result
ndb_minmax.result
ndb_multi.result
ndb_read_multi_range.result
ndb_replace.result
ndb_restore.result
ndb_subquery.result
ndb_transaction.result
ndb_truncate.result
ndb_types.result
ndb_update.result
negation_elimination.result
not_embedded.require
not_embedded_server.result
not_openssl.require
null.result
null_key.result
odbc.result
olap.result
openssl_1.result
openssl_2.result
order_by.result
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
preload.result
ps.result
ps_1general.result Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 2005-10-03 18:42:30 -07:00
ps_2myisam.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_3innodb.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_4heap.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_5merge.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_6bdb.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_7ndb.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
ps_10nestset.result
ps_11bugs.result
ps_grant.result
query_cache.result Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 2005-09-29 10:25:44 +02:00
query_cache_merge.result
query_cache_notembedded.result
raid.result
range.result Reviewing new pushed code 2005-10-12 00:58:22 +03:00
rename.result
repair.result
replace.result
rollback.result
row.result
rowid_order_bdb.result
rowid_order_innodb.result BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function 2005-10-01 11:56:01 +04:00
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_chain_temp_table.result
rpl_change_master.result
rpl_charset.result Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
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_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 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 2005-10-08 16:56:10 +02:00
rpl_free_items.result
rpl_get_lock.result
rpl_heap.result
rpl_ignore_grant.result
rpl_init_slave.result
rpl_innodb.result
rpl_insert_id.result
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
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 BUG#12618: Removing fake locking 2005-10-10 15:10:14 +02:00
rpl_mystery22.result
rpl_openssl.result after merge fix 2005-10-07 15:09:44 +05:00
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 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
rpl_trigger.result
rpl_until.result
rpl_user_variables.result
rpl_variables.result
rpl_view.result
schema.result
select.result After merge fixes 2005-10-10 19:38:58 +02:00
select_found.result
select_safe.result
server_id.require
server_id1.require
show_check.result
skip_grants.result
skip_name_resolve.result Fix for bug #13407 "Remote connecting crashes server" and couple of similar 2005-09-22 23:03:53 +04:00
slave-running.result
slave-stopped.result
sp-big.result A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sp-dynamic.result
sp-error.result Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 2005-09-21 15:28:28 +02:00
sp-goto.result
sp-prelocking.result
sp-security.result
sp-threads.result
sp.result Fixed BUG#12589: Assert when creating temp. table from decimal stored 2005-09-27 17:07:28 +02:00
sp_trans.result
sql_mode.result after merge fix 2005-09-29 17:21:32 +05:00
status.result
strict.result
subselect.result
subselect2.result After merge fixes 2005-10-10 19:38:58 +02:00
subselect_gis.result
subselect_innodb.result
sum_distinct-big.result
sum_distinct.result
symlink.result
synchronization.result
system_mysql_db.result CHECKSUM TABLE now allows concurrent inserts 2005-09-27 20:11:09 +02:00
system_mysql_db_refs.result
tablelock.result
temp_table.result Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
testdb_only.require
timezone.result
timezone2.result
timezone3.result
timezone_grant.result
trigger.result
true.require
truncate.result
type_bit.result Fixed problems found by valgrind 2005-09-22 03:23:07 +03:00
type_bit_innodb.result
type_blob.result
type_date.result
type_datetime.result
type_decimal.result duplicate error message removed 2005-09-30 12:01:39 +02:00
type_enum.result
type_float.result Merging 2005-10-11 16:39:35 +05:00
type_nchar.result
type_newdecimal.result duplicate error message removed 2005-09-30 12:01:39 +02:00
type_ranges.result
type_set.result
type_time.result
type_timestamp.result
type_uint.result
type_varchar.result
type_year.result
union.result additional fix for bug #13372 (decimal union) 2005-09-27 16:23:37 +05:00
update.result Manual merge 2005-09-22 02:38:14 +04:00
user_limits.result
user_var-binlog.result Reviewing new pushed code 2005-10-12 00:58:22 +03:00
user_var.result
varbinary.result
variables.result
view.result Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
view_grant.result
view_query_cache.result Fix bug #13424 locking view with query cache enabled crashes server 2005-09-26 19:08:26 +04:00
warnings.result
windows.result
xa.result Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00