mariadb/mysql-test/r
unknown a03acb3cb5 Merge mysql.com:/users/lthalmann/bk/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-5.0


mysql-test/t/rpl_replicate_do.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/rpl_replicate_do.result:
  Manual merge
sql/log_event.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
2005-09-02 11:01:00 +02:00
..
alias.result Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-06-27 13:12:10 +02:00
alter_table.result Merge mysql.com:/home/mydev/mysql-5.0 2005-08-30 08:18:27 +02:00
analyse.result
analyze.result
ansi.result
archive.result Fix for bad merge. 2005-08-30 11:04:23 -07:00
auto_increment.result
backup.result
bdb-alter-table-1.result
bdb-alter-table-2.result
bdb-crash.result
bdb-deadlock.result
bdb.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
bdb_cache.result
bench_count_distinct.result
big_test.require
bigint.result fix after merge 2005-08-11 18:42:22 +01:00
binary.result
binlog.result
blackhole.result
bool.result
bulk_replace.result
case.result
cast.result
check.result
check_var_limit.require
client_xml.result Merge problem fixes 2005-06-27 12:25:15 +02:00
comments.result
compare.result
connect.result
consistent_snapshot.result
constraints.result
count_distinct.result
count_distinct2.result
count_distinct3.result
create.result create.test, create.result, sql_select.cc, item.cc: 2005-08-31 22:06:34 +04:00
create_select_tmp.result
csv.result
ctype_big5.result Fix for BUG#12075. 2005-08-02 14:27:52 +05:00
ctype_collate.result
ctype_cp932.result Review fixes 2005-08-24 19:37:27 +03:00
ctype_cp1250_ch.result
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result Fixed the ucs2 -> eucjpms conversion bug (bug#11717) 2005-07-18 13:38:56 -07:00
ctype_gbk.result ctype-gbk.c: 2005-07-22 21:06:02 +05:00
ctype_latin1.result Bug#11216: 'show character set' describes latin1 incorrectly 2005-07-21 16:05:19 +05:00
ctype_latin1_de.result
ctype_latin2.result
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_sjis.result ctype_innodb_like.inc: 2005-07-06 17:16:22 +05:00
ctype_tis620.result
ctype_uca.result
ctype_ucs.result Bug#9442, moved ps ucs2 test from ps.test to ctype_ucs.test 2005-07-15 19:46:42 +02:00
ctype_ucs_binlog.result
ctype_ujis.result Merge mysql.com:/usr/home/bar/mysql-4.1 2005-07-20 13:40:18 +05:00
ctype_utf8.result ctype_utf8.result, ctype_utf8.test, item.cc: 2005-08-29 16:49:01 +05:00
date_formats.result Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned 2005-07-20 06:55:51 +04:00
default.result
delayed.result Fix crash in 'INSERT DELAYED' statement that failed due to a 2005-08-01 17:00:03 -07:00
delete.result
derived.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-15 13:21:55 +04:00
dirty_close.result
distinct.result Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-22 09:40:10 -07:00
drop.result
drop_temp_table.result
empty_table.result
endspace.result
errors.result Merge mysql.com:/home/timka/mysql/src/5.0-virgin 2005-08-12 19:27:54 +03:00
exampledb.result
explain.result
federated.result Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE, 2005-07-19 03:04:51 +02:00
flush.result Merge mysql.com:/home/mydev/mysql-4.1-4100 2005-08-08 00:10:07 +02:00
flush_block_commit.result
flush_read_lock_kill.result
flush_table.result Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client 2005-08-03 02:01:27 +04:00
foreign_key.result
fulltext.result Merge mysql.com:/home/timka/mysql/src/5.0-virgin 2005-08-12 19:27:54 +03:00
fulltext2.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result Merge mysql.com:/home/timka/mysql/src/5.0-virgin 2005-08-12 19:27:54 +03:00
fulltext_update.result
fulltext_var.result
func_compress.result
func_concat.result
func_crypt.result
func_date_add.result Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
func_default.result
func_des_encrypt.result Fix crash caused by calling DES_ENCRYPT() without the --des-key-file 2005-07-07 11:49:44 -07:00
func_encrypt.result Portability fixes 2005-06-27 20:31:00 +03:00
func_encrypt_nossl.result Fix test after last push 2005-06-27 20:31:02 +03:00
func_equal.result
func_gconcat.result Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 15:24:06 -07:00
func_group.result After merge fixes 2005-07-28 21:39:24 +03:00
func_if.result
func_in.result func_in.result, func_in.test: 2005-07-16 18:06:34 -07:00
func_isnull.result
func_like.result
func_math.result Fix two test results that were merged out-of-order. 2005-08-01 19:21:56 -07:00
func_misc.result Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689) 2005-08-19 15:51:40 -07:00
func_op.result
func_regexp.result
func_sapdb.result
func_set.result
func_str.result func_str.result, null.result: 2005-08-26 22:25:45 -07:00
func_system.result Merge mysql.com:/usr/home/bar/mysql-4.1.b12351 2005-08-12 17:10:00 +05:00
func_test.result func_str.result, null.result: 2005-08-26 22:25:45 -07:00
func_time.result Make SYSDATE() behave as in Oracle: always the current datetime, not the 2005-08-24 15:50:58 -07:00
func_timestamp.result
gcc296.result
gis-rtree.result Merge deer.(none):/home/hf/work/mysql-4.1.clean 2005-08-27 18:10:46 +05:00
gis.result gis.test corrected with Pem's wishes 2005-08-27 20:06:35 +05:00
grant.result grant.result: 2005-08-08 19:04:11 +05:00
grant2.result Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 2005-09-01 23:25:29 +04:00
grant3.result
grant_cache.result
greedy_optimizer.result
group_by.result Post-merge fixes 2005-08-07 22:10:05 +00:00
group_min_max.result Fix group_min_max.test - myisam may return slightly row count estimate on amd64 2005-08-31 13:23:24 +04: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 ctype-gbk.c: 2005-07-22 21:06:02 +05:00
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 Fixed test that failed on 32 bit systems 2005-08-09 11:21:45 +03:00
heap_auto_increment.result
heap_btree.result
heap_hash.result Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 2005-06-24 19:47:19 +02:00
help.result
index_merge.result
index_merge_bdb.result
index_merge_innodb.result Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call 2005-08-30 03:14:39 +04:00
index_merge_innodb2.result
index_merge_ror.result
index_merge_ror_cpk.result
information_schema.result retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 2005-08-27 12:29:36 +02:00
information_schema_db.result fix for bug #12315 - SHOW TABLE STATUS FROM information_schema; does not sort tablenames 2005-08-05 11:01:29 +02:00
information_schema_inno.result
init_connect.result
innodb-big.result
innodb-deadlock.result
innodb-lock.result
innodb-replace.result
innodb.result Merge mysql.com:/home/mydev/mysql-5.0 2005-08-30 12:35:37 +02:00
innodb_cache.result
innodb_handler.result
insert.result
insert_select-binlog.result
insert_select.result Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
insert_update.result Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3 2005-08-10 22:17:53 +01:00
isam.result
join.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
join_crash.result Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
join_nested.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
join_outer.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
key.result After merge fix. 2005-08-29 21:06:45 +02:00
key_cache.result Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO 2005-08-07 20:39:17 +02:00
key_diff.result
key_primary.result
keywords.result
kill.result
limit.result
loaddata.result
lock.result
lock_multi.result
lock_tables_lost_commit.result
lowercase0.require
lowercase2.require
lowercase_table.result Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 19:12:16 -07:00
lowercase_table2.result lowercase_table2.test, lowercase_table2.result: 2005-07-05 17:27:37 +02:00
lowercase_table3.result
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_view.result
merge.result
metadata.result Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07:00
mix_innodb_myisam_binlog.result
multi_statement.result
multi_update.result Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
myisam-blob.result
myisam.result Merge mysql.com:/home/mydev/mysql-4.1-4100 2005-08-29 18:18:30 +02:00
mysql.result Fix 'source' command in mysql client to handle delimiter command 2005-08-09 12:17:28 -07:00
mysql_protocols.result
mysqlbinlog.result
mysqlbinlog2.result
mysqldump.result postmerge-fix 2005-07-30 09:24:51 +03:00
mysqlshow.result
mysqltest.result Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-01 17:15:37 +02:00
ndb_alter_table.result Merge eel.(none):/home/jonas/src/mysql-4.1 2005-08-18 14:25:00 +02:00
ndb_autodiscover.result Fixed failed merge 2005-07-12 11:49:57 +02:00
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 Fix for bug#12021 2005-07-31 21:33:46 +02:00
ndb_config.result ndb - changed config 2005-07-26 09:06:37 +02:00
ndb_database.result
ndb_default_cluster.require
ndb_grant.result
ndb_index.result
ndb_index_ordered.result ndb - fix ha_ndb crash on ordered index on nullable varchar 2005-09-01 14:12:48 +02:00
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 Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected 2005-07-27 13:45:06 +03:00
not_openssl.require
null.result func_str.result, null.result: 2005-08-26 22:25:45 -07:00
null_key.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
odbc.result
olap.result After-merge fixes. 2005-07-19 03:01:25 +04:00
openssl_1.result
openssl_2.result
order_by.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
preload.result
ps.result Merge mysql.com:/opt/local/work/mysql-4.1-root 2005-07-16 13:45:32 +04:00
ps_1general.result Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-01 17:54:57 -07:00
ps_2myisam.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_3innodb.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_4heap.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_5merge.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_6bdb.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_7ndb.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
ps_10nestset.result
ps_11bugs.result
ps_grant.result After merge fixes 2005-07-28 21:39:24 +03:00
query_cache.result fix after merge 2005-08-11 18:42:22 +01:00
query_cache_merge.result
query_cache_notembedded.result query_cache_notembedded.test, query_cache_notembedded.result: 2005-08-11 13:07:08 +03:00
raid.result
range.result opt_range.cc: 2005-07-16 08:19:20 -07:00
rename.result
repair.result
replace.result
rollback.result
row.result stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03: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_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 Merge mysql.com:/home/bkroot/mysql-4.1 2005-07-13 14:15:23 +02:00
rpl_delete_all.result fixed test after merge 2005-08-19 11:38:14 +03:00
rpl_do_grant.result
rpl_drop.result
rpl_drop_db.result Review fixes 2005-08-24 19:37:27 +03:00
rpl_drop_temp.result Fixed compiler warnings 2005-07-28 21:25:05 +03:00
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 Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 2005-09-01 12:53:23 +02:00
rpl_flush_tables.result
rpl_free_items.result
rpl_get_lock.result
rpl_heap.result
rpl_ignore_grant.result
rpl_init_slave.result
rpl_innodb.result Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 2005-07-05 13:55:54 +02:00
rpl_insert_id.result
rpl_insert_ignore.result
rpl_insert_select.result Added a test case for BUG#10456 2005-08-02 15:13:56 -06:00
rpl_loaddata.result
rpl_loaddata_rule_m.result
rpl_loaddata_rule_s.result
rpl_loaddatalocal.result
rpl_log.result After-merge fixes. 2005-07-19 03:01:25 +04:00
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
rpl_mystery22.result
rpl_openssl.result Fix rpl_openssl test to actually work. (Bug #12457, Bug #10860) 2005-08-10 13:30:53 -07:00
rpl_optimize.result
rpl_ps.result
rpl_redirect.result
rpl_relayrotate.result
rpl_relayspace.result
rpl_replicate_do.result Merge mysql.com:/users/lthalmann/bk/mysql-4.1 2005-09-02 11:01:00 +02:00
rpl_reset_slave.result
rpl_rewrite_db.result
rpl_rotate_logs.result After-merge fixes. 2005-07-19 03:01:25 +04:00
rpl_server_id1.result
rpl_server_id2.result
rpl_session_var.result
rpl_set_charset.result
rpl_skip_error.result
rpl_slave_status.result BUG#12330 Adding updated result file which I missed in last changeset. 2005-08-03 16:12:06 -04:00
rpl_sp.result Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
rpl_sp_effects.result BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way. 2005-08-25 18:13:56 +04:00
rpl_sporadic_master.result
rpl_start_stop_slave.result
rpl_temporary.result
rpl_timezone.result
rpl_trigger.result Save and clear run context before executing a stored function or trigger and restore it afterwards. 2005-08-15 18:15:12 +03:00
rpl_until.result
rpl_user_variables.result
rpl_variables.result
rpl_view.result
schema.result
select.result fix for bug #12841 2005-08-29 15:45:03 +02:00
select_found.result
select_safe.result Fix bug #11864 non unique names are allowed in subquery 2005-08-10 17:45:00 +04:00
server_id.require
server_id1.require
show_check.result fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
skip_grants.result
skip_name_resolve.result
slave-running.result
slave-stopped.result
sp-big.result Increase allowed size of stored procedure bodies to 4GB, and 2005-07-26 18:08:49 -07:00
sp-error.result fix for bug #12490 (all-in-one patch) 2005-08-29 12:19:08 +02:00
sp-goto.result Disabled the GOTO feature. (It's non-standard and undocumented.) 2005-07-01 15:25:51 +02:00
sp-prelocking.result Prelocking-free SPs, post-review fixes: 2005-08-03 03:37:32 +00:00
sp-security.result Fixes during review of new pushed code 2005-08-20 11:00:00 +03:00
sp-threads.result BUG#12228: Post review fixes: Added test case, code cleanup. 2005-08-10 21:17:02 +00:00
sp.result retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 2005-08-27 12:29:36 +02:00
sp_trans.result
sql_mode.result retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 2005-08-27 12:29:36 +02:00
status.result
strict.result after-merge fix 2005-07-27 15:57:00 +05:00
subselect.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
subselect2.result After merge fixes 2005-08-25 09:38:06 +03:00
subselect_gis.result
subselect_innodb.result
sum_distinct-big.result
sum_distinct.result
symlink.result
synchronization.result
system_mysql_db.result Increase allowed size of stored procedure bodies to 4GB, and 2005-07-26 18:08:49 -07:00
system_mysql_db_refs.result
tablelock.result
temp_table.result
testdb_only.require
timezone.result
timezone2.result Fix number to date conversion so it always honors the NO_ZERO_DATE, 2005-07-18 16:12:44 -07:00
timezone3.result
timezone_grant.result Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 2005-07-19 00:55:37 +04:00
trigger.result Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-23 09:15:05 +04:00
true.require
truncate.result
type_bit.result Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4 2005-08-10 21:17:52 +00:00
type_bit_innodb.result Fix error message when creating a non-string field with a display 2005-08-05 17:22:53 -07:00
type_blob.result sql_table.cc: 2005-07-01 15:07:06 +05:00
type_date.result
type_datetime.result fix after merge 2005-08-11 18:42:22 +01:00
type_decimal.result Fix for bug #8449(Silent column changes) 2005-07-07 21:47:18 +05:00
type_enum.result
type_float.result Fix for bug #8449(Silent column changes) 2005-07-07 21:47:18 +05:00
type_nchar.result
type_newdecimal.result Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-01 17:15:37 +02:00
type_ranges.result WL#2486 - natural and using join according to SQL:2003 2005-08-23 18:08:04 +03:00
type_set.result
type_time.result
type_timestamp.result
type_uint.result
type_varchar.result
type_year.result
union.result Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
update.result Merge moonbone.local:/work/mysql-4.1-bug-11868 2005-07-18 19:37:42 +04:00
user_limits.result
user_var-binlog.result
user_var.result Fix two test results that were merged out-of-order. 2005-08-01 19:21:56 -07:00
varbinary.result
variables.result Merge mysql.com:/usr/home/ram/work/4.1.b9613 2005-08-31 10:25:00 +05:00
view.result Fix bug #12489 wrongly printed strcmp() function results in creation of broken 2005-08-31 00:54:41 +04:00
view_grant.result Fix bug #11335 View redefines TinyInt(1) column definition 2005-07-30 05:53:35 +04:00
view_query_cache.result
warnings.result
windows.result Fix handling of filenames that start the same as reserved filenames 2005-08-31 18:32:15 -07:00
xa.result BUG#12162 - one can start two transactions with the same XID. 2005-08-12 21:15:01 +02:00