mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +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 |
||
---|---|---|
.. | ||
add_anonymous_users.inc | ||
analyze_failure_sync_with_master.test | ||
big_test.inc | ||
check-testcase.test | ||
check_var_limit.inc | ||
commit.inc | ||
common-tests.inc | ||
concurrent.inc | ||
connect2.inc | ||
ctype_common.inc | ||
ctype_filesort.inc | ||
ctype_german.inc | ||
ctype_innodb_like.inc | ||
ctype_like_escape.inc | ||
ctype_like_range_f1f2.inc | ||
ctype_regex.inc | ||
ddl_i18n.check_events.inc | ||
ddl_i18n.check_sp.inc | ||
ddl_i18n.check_triggers.inc | ||
ddl_i18n.check_views.inc | ||
deadlock.inc | ||
delete_anonymous_users.inc | ||
diff_tables.inc | ||
endspace.inc | ||
federated.inc | ||
federated_cleanup.inc | ||
get_binlog_dump_thread_id.inc | ||
gis_generic.inc | ||
gis_keys.inc | ||
grant_cache.inc | ||
handler.inc | ||
have_archive.inc | ||
have_big5.inc | ||
have_binlog_format_mixed.inc | ||
have_binlog_format_mixed_or_row.inc | ||
have_binlog_format_mixed_or_statement.inc | ||
have_binlog_format_row.inc | ||
have_binlog_format_row_or_statement.inc | ||
have_binlog_format_statement.inc | ||
have_blackhole.inc | ||
have_bug25714.inc | ||
have_case_sensitive_file_system.inc | ||
have_community_features.inc | ||
have_compress.inc | ||
have_cp866.inc | ||
have_cp932.inc | ||
have_cp1250_ch.inc | ||
have_cp1251.inc | ||
have_crypt.inc | ||
have_csv.inc | ||
have_debug.inc | ||
have_eucjpms.inc | ||
have_euckr.inc | ||
have_example_plugin.inc | ||
have_exampledb.inc | ||
have_federated_db.inc | ||
have_gb2312.inc | ||
have_gbk.inc | ||
have_geometry.inc | ||
have_innodb.inc | ||
have_koi8r.inc | ||
have_latin2_ch.inc | ||
have_local_infile.inc | ||
have_log_bin.inc | ||
have_lowercase0.inc | ||
have_lowercase1.inc | ||
have_maria.inc | ||
have_multi_ndb.inc | ||
have_ndb.inc | ||
have_ndb_extra.inc | ||
have_ndbapi_examples.inc | ||
have_outfile.inc | ||
have_partition.inc | ||
have_query_cache.inc | ||
have_sjis.inc | ||
have_ssl.inc | ||
have_symlink.inc | ||
have_tis620.inc | ||
have_ucs2.inc | ||
have_udf.inc | ||
have_ujis.inc | ||
have_utf8.inc | ||
index_merge1.inc | ||
index_merge2.inc | ||
index_merge_2sweeps.inc | ||
index_merge_ror.inc | ||
index_merge_ror_cpk.inc | ||
innodb_rollback_on_timeout.inc | ||
innodb_trx_weight.inc | ||
loaddata_autocom.inc | ||
maria_empty_logs.inc | ||
maria_make_snapshot.inc | ||
maria_make_snapshot_for_comparison.inc | ||
maria_make_snapshot_for_feeding_recovery.inc | ||
maria_verify_recovery.inc | ||
master-slave-end.inc | ||
master-slave-reset.inc | ||
master-slave.inc | ||
mix1.inc | ||
mix2.inc | ||
mix2_ucs2.inc | ||
mysqltest-x.inc | ||
ndb_backup.inc | ||
ndb_backup_print.inc | ||
ndb_default_cluster.inc | ||
ndb_master-slave.inc | ||
ndb_not_readonly.inc | ||
ndb_restore_master.inc | ||
ndb_restore_slave_eoption.inc | ||
ndb_setup_slave.inc | ||
ndb_wait_connected.inc | ||
not_as_root.inc | ||
not_embedded.inc | ||
not_ndb.inc | ||
not_ndb_default.inc | ||
not_openssl.inc | ||
not_valgrind.inc | ||
not_windows.inc | ||
one_thread_per_connection.inc | ||
parser_bug21114.inc | ||
ps_conv.inc | ||
ps_create.inc | ||
ps_modify.inc | ||
ps_modify1.inc | ||
ps_query.inc | ||
ps_renew.inc | ||
query_cache.inc | ||
query_cache_sql_prepare.inc | ||
read_many_rows.inc | ||
report-features.test | ||
reset_master_and_slave.inc | ||
rowid_order.inc | ||
rpl_events.inc | ||
rpl_multi_engine.inc | ||
rpl_multi_engine2.inc | ||
rpl_multi_engine3.inc | ||
rpl_stmt_seq.inc | ||
rpl_udf.inc | ||
safe_set_to_maybe_ro_var.inc | ||
select_ndb_apply_status.inc | ||
set_binlog_format_mixed.sql | ||
set_binlog_format_row.sql | ||
set_binlog_format_statement.sql | ||
show_binary_logs.inc | ||
show_binlog_events.inc | ||
show_binlog_events2.inc | ||
show_binlog_using_logname.inc | ||
show_master_logs.inc | ||
show_master_status.inc | ||
show_msg.inc | ||
show_msg80.inc | ||
show_slave_status.inc | ||
show_slave_status2.inc | ||
sp-vars.inc | ||
strict_autoinc.inc | ||
system_db_struct.inc | ||
test_fieldsize.inc | ||
test_outfile.inc | ||
testdb_only.inc | ||
tpcb.inc | ||
tpcb_disk_data.inc | ||
unsafe_binlog.inc | ||
uses_vardir.inc | ||
varchar.inc | ||
wait_condition.inc | ||
wait_for_binlog_event.inc | ||
wait_for_query_to_suceed.inc | ||
wait_for_slave_io_to_stop.inc | ||
wait_for_slave_param.inc | ||
wait_for_slave_sql_error.inc | ||
wait_for_slave_sql_to_stop.inc | ||
wait_for_slave_to_start.inc | ||
wait_for_slave_to_stop.inc | ||
wait_show_pattern.inc | ||
wait_slave_status.inc | ||
wait_until_connected_again.inc | ||
wait_until_rows_count.inc | ||
windows.inc |