mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
50ceea65cf
into mysql.com:/home/my/mysql-new BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged CMakeLists.txt: Auto merged client/get_password.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged cmd-line-utils/readline/bind.c: Auto merged cmd-line-utils/readline/display.c: Auto merged cmd-line-utils/readline/histexpand.c: Auto merged cmd-line-utils/readline/history.c: Auto merged cmd-line-utils/readline/readline.c: Auto merged cmd-line-utils/readline/text.c: Auto merged dbug/user.r: Auto merged extra/yassl/src/handshake.cpp: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/mysql/plugin.h: Auto merged include/mysql_com.h: Auto merged include/thr_alarm.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysql/Makefile.shared: Auto merged libmysql/dll.c: Auto merged libmysql/get_password.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/change_user.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/mix2_myisam.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/valgrind.supp: Auto merged mysql-test/r/view.result: Auto merged mysql-test/suite/rpl/r/rpl_events.result: Auto merged mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged mysql-test/t/view.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_atomic.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_create.c: Auto merged mysys/my_delete.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged mysys/my_open.c: Auto merged mysys/my_realloc.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_symlink.c: Auto merged mysys/my_sync.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged scripts/make_binary_distribution.sh: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql/CMakeLists.txt: Auto merged sql/Makefile.am: Auto merged sql/events.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/partition_info.cc: Auto merged sql/rpl_injector.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/unireg.cc: Auto merged sql/share/errmsg.txt: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/myisam/CMakeLists.txt: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_test.c: Auto merged support-files/mysql.spec.sh: Auto merged tests/mysql_client_test.c: Auto merged configure.in: Manual merge dbug/dbug.c: Restore to original state in Maria tree The big diff comes from a wrong pull from 5.0 -> 5.1 after backporting dbug to 5.0 from 5.1 include/Makefile.am: Manual merge include/my_atomic.h: Ignore changes include/my_base.h: Manual merge include/my_dbug.h: Use orginal my_dbug.h from maria tree include/my_handler.h: Manual merge include/my_sys.h: Manual merge include/myisam.h: Manual merge mysql-test/lib/mtr_report.pl: Manual merge mysql-test/r/myisam.result: Manual merge mysql-test/suite/binlog/r/binlog_unsafe.result: Manual merge mysql-test/suite/binlog/t/binlog_unsafe.test: Manual merge mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Manual merge mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: No changes mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Manual merge mysql-test/t/change_user.test: Manual merge mysql-test/t/disabled.def: Manual merge mysql-test/t/merge.test: No changes mysql-test/t/myisam.test: Manual merge mysys/Makefile.am: Manual merge mysys/array.c: Manual merge mysys/mf_keycache.c: Manual merge mysys/my_getsystime.c: Manual merge mysys/my_handler.c: Manual merge mysys/my_pread.c: Manual merge mysys/safemalloc.c: Manual merge sql/ha_partition.cc: Manual merge sql/handler.cc: Manual merge sql/lex.h: Manual merge sql/mysql_priv.h: Manual merge sql/mysqld.cc: Manual merge sql/set_var.h: Manual merge sql/sql_class.cc: Manual merge sql/sql_insert.cc: Manual merge sql/sql_parse.cc: Manual merge sql/sql_select.cc: Manual merge sql/sql_show.cc: Manual merge sql/sql_table.cc: Manual merge storage/myisam/mi_checksum.c: No changes storage/myisam/mi_extra.c: Manual merge storage/myisam/mi_open.c: Manual merge storage/myisammrg/ha_myisammrg.cc: Manual merge strings/strmake.c: No changes |
||
---|---|---|
.. | ||
1st.result | ||
alias.result | ||
almost_full.result | ||
alter_table-big.result | ||
alter_table.result | ||
analyse.result | ||
analyze.result | ||
ansi.result | ||
archive-big.result | ||
archive.result | ||
archive_bitfield.result | ||
archive_gis.result | ||
auto_increment.result | ||
backup.result | ||
bench_count_distinct.result | ||
big_test.require | ||
bigint.result | ||
binary.result | ||
binlog_index.result | ||
binlog_tx_isolation.result | ||
bool.result | ||
bootstrap.result | ||
bulk_replace.result | ||
cache_innodb.result | ||
case.result | ||
case_sensitive_file_system.require | ||
cast.result | ||
change_user.result | ||
check.result | ||
check_var_limit.require | ||
client_xml.result | ||
comments.result | ||
commit_1innodb.result | ||
compare.result | ||
compress.result | ||
concurrent_innodb.result | ||
connect.result | ||
consistent_snapshot.result | ||
constraints.result | ||
contributors.result | ||
count_distinct.result | ||
count_distinct2.result | ||
count_distinct3.result | ||
crash_commit_before.result | ||
create-big.result | ||
create.result | ||
create_not_windows.result | ||
create_select_tmp.result | ||
csv.result | ||
csv_not_null.result | ||
ctype_ascii.result | ||
ctype_big5.result | ||
ctype_collate.result | ||
ctype_cp932_binlog_row.result | ||
ctype_cp932_binlog_stm.result | ||
ctype_cp1250_ch.result | ||
ctype_cp1251.result | ||
ctype_create.result | ||
ctype_eucjpms.result | ||
ctype_euckr.result | ||
ctype_filename.result | ||
ctype_gb2312.result | ||
ctype_gbk.result | ||
ctype_hebrew.result | ||
ctype_latin1.result | ||
ctype_latin1_de.result | ||
ctype_latin2.result | ||
ctype_latin2_ch.result | ||
ctype_ldml.result | ||
ctype_many.result | ||
ctype_mb.result | ||
ctype_recoding.result | ||
ctype_sjis.result | ||
ctype_tis620.result | ||
ctype_uca.result | ||
ctype_ucs.result | ||
ctype_ucs2_def.result | ||
ctype_ujis.result | ||
ctype_ujis_ucs2.result | ||
ctype_utf8.result | ||
date_formats.result | ||
ddl_i18n_koi8r.result | ||
ddl_i18n_utf8.result | ||
deadlock_innodb.result | ||
default.result | ||
delayed.result | ||
delete.result | ||
derived.result | ||
dirty_close.result | ||
distinct.result | ||
drop.result | ||
empty_table.result | ||
endspace.result | ||
error_simulation.result | ||
errors.result | ||
events_1.result | ||
events_2.result | ||
events_bugs.result | ||
events_grant.result | ||
events_logs_tests.result | ||
events_microsec.result | ||
events_restart_phase1.result | ||
events_restart_phase2.result | ||
events_restart_phase3.result | ||
events_scheduling.result | ||
events_stress.result | ||
events_time_zone.result | ||
events_trans.result | ||
events_trans_notembedded.result | ||
exampledb.result | ||
execution_constants.result | ||
explain.result | ||
federated.result | ||
federated_archive.result | ||
federated_bug_13118.result | ||
federated_bug_25714.result | ||
federated_innodb.result | ||
federated_server.result | ||
federated_transactions.result | ||
fix_priv_tables.result | ||
flush.result | ||
flush2.result | ||
flush_block_commit.result | ||
flush_block_commit_notembedded.result | ||
flush_read_lock_kill.result | ||
flush_table.result | ||
foreign_key.result | ||
fulltext.result | ||
fulltext2.result | ||
fulltext3.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 | ||
func_group_innodb.result | ||
func_if.result | ||
func_in.result | ||
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 | ||
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_no_prot.result | ||
grant_cache_ps_prot.result | ||
greedy_optimizer.result | ||
group_by.result | ||
group_min_max.result | ||
group_min_max_innodb.result | ||
handler_innodb.result | ||
handler_myisam.result | ||
have_big5.require | ||
have_binlog_format_mixed.require | ||
have_binlog_format_row.require | ||
have_binlog_format_statement.require | ||
have_bug25714.require | ||
have_community_features.require | ||
have_compress.require | ||
have_cp866.require | ||
have_cp932.require | ||
have_cp1250_ch.require | ||
have_cp1251.require | ||
have_crypt.require | ||
have_debug.require | ||
have_dynamic_loading.require | ||
have_eucjpms.require | ||
have_euckr.require | ||
have_example_plugin.require | ||
have_gb2312.require | ||
have_gbk.require | ||
have_geometry.require | ||
have_koi8r.require | ||
have_latin2_ch.require | ||
have_local_infile.require | ||
have_log_bin.require | ||
have_met_timezone.require | ||
have_moscow_leap_timezone.require | ||
have_mysql_upgrade.result | ||
have_ndb_extra.require | ||
have_ndbapi_examples.require | ||
have_outfile.require | ||
have_partition.require | ||
have_perror.require | ||
have_query_cache.require | ||
have_sjis.require | ||
have_ssl.require | ||
have_symlink.require | ||
have_tis620.require | ||
have_ucs2.require | ||
have_udf_example.require | ||
have_ujis.require | ||
have_utf8.require | ||
having.result | ||
heap.result | ||
heap_auto_increment.result | ||
heap_btree.result | ||
heap_hash.result | ||
help.result | ||
index_merge_innodb.result | ||
index_merge_myisam.result | ||
information_schema.result | ||
information_schema_chmod.result | ||
information_schema_db.result | ||
information_schema_inno.result | ||
information_schema_part.result | ||
init_connect.result | ||
init_file.result | ||
innodb-lock.result | ||
innodb-replace.result | ||
innodb-semi-consistent.result | ||
innodb-ucs2.result | ||
innodb.result | ||
innodb_autoinc_lock_mode_zero.result | ||
innodb_bug34053.result | ||
innodb_gis.result | ||
innodb_mysql.result | ||
innodb_notembedded.result | ||
innodb_timeout_rollback.result | ||
innodb_trx_weight.result | ||
insert.result | ||
insert_notembedded.result | ||
insert_select.result | ||
insert_update.result | ||
is_debug_build.require | ||
isam.result | ||
join.result | ||
join_crash.result | ||
join_nested.result | ||
join_outer.result | ||
join_outer_innodb.result | ||
key.result | ||
key_cache.result | ||
key_diff.result | ||
key_primary.result | ||
keywords.result | ||
kill.result | ||
limit.result | ||
loaddata.result | ||
loaddata_autocom_innodb.result | ||
lock.result | ||
lock_multi.result | ||
lock_tables_lost_commit.result | ||
log_state.result | ||
log_tables-big.result | ||
log_tables.result | ||
long_tmpdir.result | ||
lowercase0.require | ||
lowercase1.require | ||
lowercase2.require | ||
lowercase_fs_off.result | ||
lowercase_mixed_tmpdir.result | ||
lowercase_table.result | ||
lowercase_table2.result | ||
lowercase_table3.result | ||
lowercase_table_grant.result | ||
lowercase_table_qcache.result | ||
lowercase_view.result | ||
maria-big.result | ||
maria-connect.result | ||
maria-gis-rtree-dynamic.result | ||
maria-gis-rtree-trans.result | ||
maria-gis-rtree.result | ||
maria-page-checksum.result | ||
maria-preload.result | ||
maria-purge.result | ||
maria-recovery-big.result | ||
maria-recovery-bitmap.result | ||
maria-recovery-rtree-ft.result | ||
maria-recovery.result | ||
maria.result | ||
maria_notembedded.result | ||
merge-big.result | ||
merge.result | ||
merge_innodb.result | ||
metadata.result | ||
mix2_myisam.result | ||
mix2_myisam_ucs2.result | ||
multi_statement.result | ||
multi_update.result | ||
myisam-blob.result | ||
myisam-system.result | ||
myisam.result | ||
myisampack.result | ||
mysql.result | ||
mysql_client_test.result | ||
mysql_comments.result | ||
mysql_cp932.result | ||
mysql_protocols.result | ||
mysql_upgrade.result | ||
mysqladmin.result | ||
mysqlbinlog-cp932.result | ||
mysqlbinlog.result | ||
mysqlbinlog2.result | ||
mysqlbinlog_base64.result | ||
mysqlcheck.result | ||
mysqldump-compat.result | ||
mysqldump-max.result | ||
mysqldump-no-binlog.result | ||
mysqldump.result | ||
mysqlshow.result | ||
mysqlslap.result | ||
mysqltest.result | ||
named_pipe.result | ||
ndb_default_cluster.require | ||
negation_elimination.result | ||
no-threads.result | ||
not_as_root.require | ||
not_embedded.require | ||
not_embedded_server.result | ||
not_ndb.require | ||
not_ndb_default.require | ||
not_openssl.require | ||
not_partition.require | ||
not_partition.result | ||
not_valgrind.require | ||
not_windows.require | ||
null.result | ||
null_key.result | ||
odbc.result | ||
olap.result | ||
old-mode.result | ||
one_thread_per_connection.require | ||
openssl_1.result | ||
order_by.result | ||
order_fill_sortbuf.result | ||
outfile.result | ||
outfile_loaddata.result | ||
overflow.result | ||
packet.result | ||
parser.result | ||
parser_bug21114_innodb.result | ||
parser_precedence.result | ||
partition.result | ||
partition_archive.result | ||
partition_blackhole.result | ||
partition_bug18198.result | ||
partition_charset.result | ||
partition_csv.result | ||
partition_datatype.result | ||
partition_error.result | ||
partition_federated.result | ||
partition_grant.result | ||
partition_hash.result | ||
partition_innodb.result | ||
partition_list.result | ||
partition_mgm.result | ||
partition_mgm_err.result | ||
partition_mgm_err2.result | ||
partition_not_windows.result | ||
partition_order.result | ||
partition_pruning.result | ||
partition_range.result | ||
partition_symlink.result | ||
partition_windows.result | ||
perror.result | ||
plugin.result | ||
plugin_load.result | ||
preload.result | ||
profiling.result | ||
ps.result | ||
ps_1general.result | ||
ps_2myisam.result | ||
ps_3innodb.result | ||
ps_4heap.result | ||
ps_5merge.result | ||
ps_10nestset.result | ||
ps_11bugs.result | ||
ps_ddl.result | ||
ps_grant.result | ||
ps_maria.result | ||
ps_not_windows.result | ||
query_cache.result | ||
query_cache_debug.result | ||
query_cache_merge.result | ||
query_cache_notembedded.result | ||
query_cache_ps_no_prot.result | ||
query_cache_ps_ps_prot.result | ||
query_cache_with_views.result | ||
raid.result | ||
range.result | ||
read_many_rows_innodb.result | ||
read_only.result | ||
read_only_innodb.result | ||
rename.result | ||
renamedb.result | ||
repair.result | ||
replace.result | ||
rollback.result | ||
round.result | ||
row.result | ||
rowid_order_innodb.result | ||
rpl_colSize.result | ||
rpl_extraColmaster_innodb.result | ||
rpl_extraColmaster_myisam.result | ||
schema.result | ||
select.result | ||
select_found.result | ||
select_safe.result | ||
server_id.require | ||
server_id1.require | ||
shm.result | ||
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 | ||
sp-prelocking.result | ||
sp-security.result | ||
sp-threads.result | ||
sp-ucs2.result | ||
sp-vars.result | ||
sp.result | ||
sp_gis.result | ||
sp_notembedded.result | ||
sp_stress_case.result | ||
sp_trans.result | ||
sp_trans_log.result | ||
sql_mode.result | ||
ssl-big.result | ||
ssl.result | ||
ssl_8k_key.result | ||
ssl_compress.result | ||
ssl_connect.result | ||
status.result | ||
strict.result | ||
strict_autoinc_1myisam.result | ||
strict_autoinc_2innodb.result | ||
strict_autoinc_3heap.result | ||
subselect.result | ||
subselect2.result | ||
subselect3.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 | ||
timezone4.result | ||
timezone_grant.result | ||
trigger-compat.result | ||
trigger-trans.result | ||
trigger.result | ||
trigger_notembedded.result | ||
true.require | ||
truncate.result | ||
type_binary.result | ||
type_bit.result | ||
type_bit_innodb.result | ||
type_blob.result | ||
type_date.result | ||
type_datetime.result | ||
type_decimal.result | ||
type_enum.result | ||
type_float.result | ||
type_nchar.result | ||
type_newdecimal-big.result | ||
type_newdecimal.result | ||
type_ranges.result | ||
type_set.result | ||
type_time.result | ||
type_timestamp.result | ||
type_uint.result | ||
type_varchar.result | ||
type_year.result | ||
udf.result | ||
udf_skip_grants.result | ||
union.result | ||
unsafe_binlog_innodb.result | ||
update.result | ||
upgrade.result | ||
user_limits.result | ||
user_var-binlog.result | ||
user_var.result | ||
varbinary.result | ||
variables+c.result | ||
variables-big.result | ||
variables-notembedded.result | ||
variables.result | ||
variables_debug.result | ||
view.result | ||
view_grant.result | ||
wait_timeout.result | ||
warnings.result | ||
warnings_engine_disabled.result | ||
windows.require | ||
windows.result | ||
xa.result | ||
xml.result |