unknown f83bd712ae Merge bk-internal.mysql.com:/home/bk/mysql-maria ... into mysql.com:/home/my/mysql-maria mysql-test/r/maria.result: Auto merged mysql-test/suite/ndb/r/ndb_auto_increment.result: Auto merged mysql-test/t/maria.test: Auto merged mysys/hash.c: Auto merged mysys/thr_lock.c: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/log_event.cc: Auto merged sql/log_event_old.cc: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/csv/ha_tina.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/maria/Makefile.am: Auto merged storage/maria/ma_check.c: Auto merged storage/maria/ma_control_file.c: Auto merged storage/maria/ma_delete_all.c: Auto merged storage/maria/ma_dynrec.c: Auto merged storage/maria/ma_init.c: Auto merged storage/maria/ma_key_recover.c: Auto merged storage/maria/ma_open.c: Auto merged storage/maria/ma_page.c: Auto merged storage/maria/ma_range.c: Auto merged storage/maria/ma_recovery.c: Auto merged storage/maria/ma_test1.c: Auto merged storage/maria/maria_read_log.c: Auto merged storage/maria/unittest/ma_test_all-t: Auto merged storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Auto merged storage/maria/unittest/ma_test_recovery.pl: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/myisamdef.h: Auto merged include/my_base.h: Manual merge where error code are kept same as in 5.1 mysys/my_handler.c: No changes sql/item.cc: Manual merge sql/sql_class.cc: Manual merge sql/sql_insert.cc: Manual merge storage/maria/ha_maria.cc: Manual merge storage/maria/ma_blockrec.c: Manual merge storage/maria/ma_delete.c: Manual merge storage/maria/ma_write.c: Manual merge		2008-05-29 21:39:25 +03:00
..
1st.test
alias.test
almost_full.test
alter_table-big.test
alter_table.test
analyse.test
analyze.test
ansi.test
archive-big.test
archive.test
archive_bitfield.test
archive_gis.test
auto_increment.test
backup-master.sh
backup.test
bench_count_distinct.test
bigint.test
binary.test
binlog_index.test	Bug #18199 PURGE BINARY LOGS fails silently with missing logs;	2008-03-17 20:19:04 +02:00
bool.test
bootstrap.test
bulk_replace.test
cache_innodb-master.opt
cache_innodb.test
case.test
cast.test
change_user.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
check.test
client_xml.test
comments.test
commit_1innodb.test
compare.test
compress.test
concurrent_innodb-master.opt
concurrent_innodb.test
connect.test	Avoid races in connect.test.	2008-03-17 14:26:00 +03:00
consistent_snapshot.test
constraints.test
contributors.test
count_distinct.test
count_distinct2-master.opt
count_distinct2.test
count_distinct3.test
crash_commit_before-master.opt
crash_commit_before.test
create-big.test
create.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
create_not_windows.test
create_select_tmp.test
csv.test
csv_alter_table.test
csv_not_null.test
ctype_ascii.test
ctype_big5.test
ctype_collate.test
ctype_cp932_binlog_row.test
ctype_cp932_binlog_stm.test
ctype_cp1250_ch.test
ctype_cp1251.test
ctype_create.test
ctype_eucjpms.test
ctype_euckr.test
ctype_filename.test
ctype_gb2312.test
ctype_gbk.test
ctype_hebrew.test
ctype_latin1.test
ctype_latin1_de-master.opt
ctype_latin1_de.test
ctype_latin2.test
ctype_latin2_ch.test
ctype_ldml-master.opt
ctype_ldml.test
ctype_many.test
ctype_mb.test
ctype_recoding.test
ctype_sjis.test
ctype_tis620.test
ctype_uca.test
ctype_ucs.test	Merge stella.local:/home2/mydev/mysql-5.1-amain	2008-03-26 10:27:00 +01:00
ctype_ucs2_def-master.opt
ctype_ucs2_def.test
ctype_ujis.test
ctype_ujis_ucs2.test
ctype_utf8.test
date_formats-master.opt
date_formats.test
ddl_i18n_koi8r.test
ddl_i18n_utf8.test
deadlock_innodb.test
default.test
delayed.test
delete.test
derived.test
dirty_close.test
disabled.def	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
distinct.test	Fix for bug #34928: Confusion by having Primary Key and Index	2008-03-26 19:37:36 +03:00
drop.test	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1	2008-03-27 08:20:25 +01:00
empty_table.test
endspace.test
error_simulation-master.opt
error_simulation.test
errors.test
events_1.test
events_2.test
events_bugs-master.opt
events_bugs.test
events_grant.test
events_logs_tests-master.opt
events_logs_tests.test
events_microsec.test
events_restart_phase1.test
events_restart_phase2-master.opt
events_restart_phase2.test
events_restart_phase3-master.opt
events_restart_phase3.test
events_scheduling.test
events_stress.test
events_time_zone.test
events_trans.test
events_trans_notembedded.test
exampledb.test
execution_constants.test
explain.test
federated.test	Merge trift2.:/MySQL/M51/mysql-5.1	2008-03-27 12:45:16 +01:00
federated_archive.test
federated_bug_13118.test
federated_bug_25714.test
federated_innodb-slave.opt
federated_innodb.test
federated_server.test
federated_transactions-slave.opt
federated_transactions.test
fix_priv_tables.test
flush.test	Merge mysql.com:/home/hf/work/33334/my50-33334	2008-03-23 20:35:00 +04:00
flush2-master.opt
flush2.test
flush_block_commit.test
flush_block_commit_notembedded.test
flush_read_lock_kill-master.opt
flush_read_lock_kill.test	Bug#34891 sp_notembedded.test fails sporadically	2008-03-13 14:54:29 -03:00
flush_table.test
foreign_key.test
fulltext.test
fulltext2.test
fulltext3.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
func_default.test
func_des_encrypt.test
func_encrypt-master.opt
func_encrypt.test
func_encrypt_nossl.test
func_equal.test
func_gconcat.test
func_group.test	Merge kaamos.(none):/data/src/opt/bug34512/my50	2008-03-19 14:25:36 +03:00
func_group_innodb.test
func_if.test
func_in.test
func_isnull.test
func_like.test
func_math.test
func_misc.test	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1	2008-03-14 11:13:54 -07:00
func_op.test
func_regexp.test
func_sapdb.test
func_set.test
func_str.test
func_system.test
func_test.test
func_time.test
func_timestamp.test
gcc296.test
gis-rtree.test
gis.test
grant.test	Patch clean up.	2008-03-27 09:37:20 -03:00
grant2.test
grant3-master.opt
grant3.test
grant_cache_no_prot.test
grant_cache_ps_prot.test
greedy_optimizer.test
group_by.test	Merge moonbone.local:/work/27219-5.0-opt-mysql	2008-03-28 18:09:14 +03:00
group_min_max.test
group_min_max_innodb.test
handler_innodb.test
handler_myisam.test
having.test
heap.test
heap_auto_increment.test
heap_btree.test
heap_hash.test
help.test
index_merge_innodb.test
index_merge_myisam.test
information_schema.test	Merge host.loc:/home/uchum/work/mysql-5.1	2008-03-27 15:54:45 +04:00
information_schema_chmod.test
information_schema_db.test
information_schema_inno.test	Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes	2008-03-14 14:12:39 +04:00
information_schema_part.test
init_connect-master.opt
init_connect.test
init_file-master.opt
init_file.test
innodb-lock.test
innodb-master.opt
innodb-replace.test
innodb-semi-consistent-master.opt
innodb-semi-consistent.test
innodb-ucs2.test
innodb.test	Apply innodb-5.1-ss2360 snapshot	2008-03-27 02:40:45 +01:00
innodb_autoinc_lock_mode_zero-master.opt
innodb_autoinc_lock_mode_zero.test
innodb_bug34053.test
innodb_gis.test
innodb_mysql-master.opt
innodb_mysql.test
innodb_notembedded.test
innodb_timeout_rollback-master.opt
innodb_timeout_rollback.test
innodb_trx_weight.test
insert.test
insert_notembedded.test
insert_select.test
insert_update.test
join.test
join_crash.test
join_nested.test
join_outer.test
join_outer_innodb.test
key.test
key_cache-master.opt
key_cache.test	Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash	2008-03-27 17:43:17 +01:00
key_diff.test
key_primary.test
keywords.test
kill.test	Bug#34891 sp_notembedded.test fails sporadically	2008-03-13 14:54:29 -03:00
limit.test
loaddata.test	Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt	2008-03-28 23:54:14 +03:00
loaddata_autocom_innodb.test
lock.test
lock_multi.test
lock_tables_lost_commit-master.opt
lock_tables_lost_commit.test
log_state-master.opt
log_state.test
log_tables-big-master.opt
log_tables-big.test
log_tables-master.opt
log_tables.test
long_tmpdir-master.opt
long_tmpdir-master.sh
long_tmpdir.test
lowercase_fs_off.test
lowercase_mixed_tmpdir-master.opt
lowercase_mixed_tmpdir-master.sh
lowercase_mixed_tmpdir.test
lowercase_table-master.opt
lowercase_table.test
lowercase_table2.test
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
maria-big.test
maria-connect.test
maria-gis-rtree-dynamic.test	WL#3072 - Maria Recovery	2008-04-24 17:22:51 +02:00
maria-gis-rtree-trans.test	WL#3072 - Maria Recovery	2008-04-24 17:22:51 +02:00
maria-gis-rtree.test	Fix for pushbuild problems: innocuous Valgrind error (uninitialized	2008-03-21 22:29:05 +01:00
maria-mvcc.test	WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"	2008-05-29 18:33:33 +03:00
maria-page-checksum.test	WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"	2008-05-29 18:33:33 +03:00
maria-preload.test
maria-purge.test
maria-recovery-big-master.opt
maria-recovery-big.test
maria-recovery-bitmap-master.opt
maria-recovery-bitmap.test
maria-recovery-master.opt
maria-recovery-rtree-ft-master.opt	WL#3072 - Maria Recovery	2008-04-24 17:22:51 +02:00
maria-recovery-rtree-ft.test	No more 'have_maria' variable, use information schema.engines.	2008-04-24 23:13:56 +02:00
maria-recovery.test
maria.test	Merge bk-internal.mysql.com:/home/bk/mysql-maria	2008-05-29 21:39:25 +03:00
maria_notembedded.test
merge-big.test
merge.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
merge_innodb.test
metadata.test
mix2_myisam.test
mix2_myisam_ucs2.test
multi_statement-master.opt
multi_statement.test
multi_update-master.opt
multi_update.test
myisam-blob-master.opt
myisam-blob.test
myisam-system.test
myisam.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
myisampack.test
mysql.test
mysql_client_test-master.opt
mysql_client_test.test
mysql_comments.sql
mysql_comments.test
mysql_cp932.test
mysql_delimiter.sql
mysql_delimiter_19799.sql
mysql_delimiter_source.sql
mysql_protocols.test
mysql_upgrade.test
mysqladmin.test
mysqlbinlog-cp932-master.opt
mysqlbinlog-cp932.test
mysqlbinlog-master.opt
mysqlbinlog.test
mysqlbinlog2.test
mysqlbinlog_base64.test
mysqlcheck.test
mysqldump-compat.opt
mysqldump-compat.test
mysqldump-max.test
mysqldump-no-binlog-master.opt
mysqldump-no-binlog.test
mysqldump.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
mysqlshow.test
mysqlslap.test
mysqltest.test
named_pipe-master.opt
named_pipe.test
negation_elimination.test
no-threads-master.opt
no-threads.test
not_embedded_server-master.opt
not_embedded_server.test
not_partition.test
null.test
null_key.test
odbc.test
olap.test
old-mode-master.opt
old-mode.test
openssl_1.test
order_by.test	Bug #35206: select query result different if the key is indexed or not	2008-03-27 19:39:21 +02:00
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test
outfile_loaddata.test
overflow.test
packet.test
parser.test
parser_bug21114_innodb.test
parser_precedence.test
partition-master.opt
partition.test
partition_archive.test
partition_blackhole.test
partition_bug18198.test
partition_charset.test
partition_csv.test
partition_datatype.test
partition_error.test
partition_federated.test
partition_grant.test
partition_hash.test
partition_innodb.test
partition_list.test
partition_mgm.test
partition_mgm_err.test
partition_mgm_err2.test
partition_not_windows-master.opt
partition_not_windows.test	Bug#35305: partition_symlink test failures	2008-03-17 16:11:26 +01:00
partition_order.test
partition_pruning.test
partition_range.test
partition_symlink.test	Bug#35305: partition_symlink test failures	2008-03-17 16:11:26 +01:00
partition_windows.test
perror.test
plugin-master.opt
plugin.test
plugin_load-master.opt
plugin_load.test
preload.test
profiling.test
ps-master.opt
ps.test
ps_1general.test
ps_2myisam.test
ps_3innodb.test
ps_4heap.test
ps_5merge.test
ps_10nestset.test
ps_11bugs.test
ps_ddl.test
ps_grant.test
ps_maria.test
ps_not_windows.test
query_cache.test	Merge mysql.com:/home/my/mysql-5.1	2008-04-28 19:24:05 +03:00
query_cache_debug.test
query_cache_merge.test
query_cache_notembedded.test
query_cache_ps_no_prot.test
query_cache_ps_ps_prot.test
query_cache_with_views.test
range.test	Merge mysql.com:/misc/mysql/34731/50-34731	2008-03-27 03:18:46 +01:00
read_many_rows_innodb.test
read_only.test
read_only_innodb.test
rename.test
renamedb.test
repair.test
replace.test
rollback.test
round.test
row.test
rowid_order_innodb.test
schema.test
select.test
select_found.test
select_safe.test
shm-master.opt
shm.test
show_check-master.opt
show_check.test
skip_grants-master.opt
skip_grants.test
skip_name_resolve-master.opt
skip_name_resolve.test
sp-big.test
sp-code.test	Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-opt	2008-03-25 17:35:34 -06:00
sp-destruct.test
sp-dynamic.test
sp-error.test	Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)	2008-03-21 12:08:04 -06:00
sp-prelocking.test
sp-security.test
sp-threads.test
sp-ucs2.test
sp-vars.test
sp.test
sp_gis.test
sp_notembedded.test	Bug#34891 sp_notembedded.test fails sporadically	2008-03-13 14:54:29 -03:00
sp_stress_case.test
sp_trans.test
sp_trans_log.test
sql_mode.test
ssl-big.test
ssl.test
ssl_8k_key.test
ssl_compress.test
ssl_connect.test
status.test
strict.test
strict_autoinc_1myisam.test
strict_autoinc_2innodb.test
strict_autoinc_3heap.test
subselect.test
subselect2.test
subselect3.test	Fixed bug #34763.	2008-03-14 23:11:59 +04:00
subselect_gis.test
subselect_innodb.test
subselect_notembedded.test
sum_distinct-big.test
sum_distinct.test
symlink.test	Merge stella.local:/home2/mydev/mysql-5.1-ateam	2008-03-20 12:22:02 +01:00
synchronization.test
sysdate_is_now-master.opt
sysdate_is_now.test
system_mysql_db.test
system_mysql_db_fix30020-master.opt
system_mysql_db_fix30020.test
system_mysql_db_fix40123-master.opt
system_mysql_db_fix40123.test
system_mysql_db_fix50030-master.opt
system_mysql_db_fix50030.test
system_mysql_db_fix50117-master.opt
system_mysql_db_fix50117.test
system_mysql_db_refs.test
tablelock.test
temp_table-master.opt
temp_table.test	Fix for bug #35392: Delete all statement does not execute properly	2008-03-28 19:16:52 +04:00
timezone-master.opt
timezone.test
timezone2.test
timezone3-master.opt
timezone3.test
timezone4-master.opt
timezone4.test
timezone_grant.test
trigger-compat.test
trigger-trans.test
trigger.test
trigger_notembedded.test
truncate.test
type_binary.test
type_bit.test
type_bit_innodb.test
type_blob.test
type_date.test
type_datetime.test
type_decimal.test
type_enum.test
type_float.test
type_nchar.test
type_newdecimal-big.test
type_newdecimal.test
type_ranges.test
type_set.test	Post-merge fix	2008-03-14 20:51:32 +01:00
type_time.test
type_timestamp.test
type_uint.test
type_varchar.test
type_year.test
udf-master.opt
udf.test
udf_skip_grants-master.opt
udf_skip_grants.test
union-master.opt
union.test
unsafe_binlog_innodb-master.opt
unsafe_binlog_innodb.test
update.test
upgrade.test
user_limits.test
user_var-binlog.test
user_var.test
varbinary.test
variables+c.test
variables-big.test
variables-notembedded-master.opt
variables-notembedded.test
variables.test
variables_debug.test
view.test	Merge host.loc:/home/uchum/work/5.0-opt	2008-03-27 00:51:29 +04:00
view_grant.test
wait_timeout-master.opt
wait_timeout.test
warnings-master.opt
warnings.test
warnings_engine_disabled-master.opt
warnings_engine_disabled.test
windows.test
xa.test
xml.test