mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
5fab3969af
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge BitKeeper/deleted/.del-im_check_os.inc: Auto merged BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Auto merged BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Auto merged BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Auto merged include/mysql_com.h: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_varchar.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/type_varchar.test: Auto merged mysql-test/t/view.test: 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_row.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/protocol.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/mysql-test-run.pl: Use local. Alik will merge his changes manually. mysql-test/lib/mtr_process.pl: Use local. mysql-test/r/grant.result: Use local. mysql-test/r/sp.result: Use local. mysql-test/r/ps.result: Manual merge. mysql-test/t/grant.test: Manual merge. mysql-test/t/ps.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/Makefile.am: Manual merge. sql/field.cc: Manual merge. sql/mysqld.cc: Manual merge. sql/share/errmsg.txt: Manual merge. sql/sp.cc: Manual merge. sql/sp_head.h: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_view.cc: Manual merge. |
||
|---|---|---|
| .. | ||
| big_test.inc | ||
| check-testcase.test | ||
| check_var_limit.inc | ||
| common-tests.inc | ||
| ctype_common.inc | ||
| ctype_filesort.inc | ||
| ctype_innodb_like.inc | ||
| ctype_like_escape.inc | ||
| endspace.inc | ||
| federated.inc | ||
| federated_cleanup.inc | ||
| get_binlog_dump_thread_id.inc | ||
| gis_generic.inc | ||
| have_archive.inc | ||
| have_big5.inc | ||
| have_binlog_format_mixed_or_row.inc | ||
| have_binlog_format_row.inc | ||
| have_binlog_format_statement.inc | ||
| have_blackhole.inc | ||
| have_case_sensitive_file_system.inc | ||
| have_compress.inc | ||
| have_cp932.inc | ||
| have_cp1250_ch.inc | ||
| have_crypt.inc | ||
| have_csv.inc | ||
| have_debug.inc | ||
| have_eucjpms.inc | ||
| have_euckr.inc | ||
| have_exampledb.inc | ||
| have_federated_db.inc | ||
| have_gb2312.inc | ||
| have_gbk.inc | ||
| have_geometry.inc | ||
| have_innodb.inc | ||
| have_latin2_ch.inc | ||
| have_lowercase0.inc | ||
| have_multi_ndb.inc | ||
| have_ndb.inc | ||
| have_ndb_extra.inc | ||
| have_openssl.inc | ||
| have_outfile.inc | ||
| have_partition.inc | ||
| have_query_cache.inc | ||
| have_row_based.inc | ||
| have_sjis.inc | ||
| have_tis620.inc | ||
| have_ucs2.inc | ||
| have_udf.inc | ||
| have_ujis.inc | ||
| im_check_env.inc | ||
| is_debug_build.inc | ||
| master-slave-end.inc | ||
| master-slave-reset.inc | ||
| master-slave.inc | ||
| mysqltest-x.inc | ||
| mysqltest_while.inc | ||
| ndb_backup.inc | ||
| ndb_default_cluster.inc | ||
| ndb_restore_master.inc | ||
| ndb_restore_slave_eoption.inc | ||
| ndb_setup_slave.inc | ||
| not_as_root.inc | ||
| not_embedded.inc | ||
| not_ndb.inc | ||
| not_ndb_default.inc | ||
| not_openssl.inc | ||
| not_row_based.inc | ||
| not_windows.inc | ||
| partition_1.inc | ||
| partition_10.inc | ||
| partition_11.inc | ||
| partition_12.inc | ||
| partition_layout.inc | ||
| ps_conv.inc | ||
| ps_create.inc | ||
| ps_modify.inc | ||
| ps_modify1.inc | ||
| ps_query.inc | ||
| ps_renew.inc | ||
| rpl_multi_engine.inc | ||
| rpl_multi_engine3.inc | ||
| rpl_row_basic.inc | ||
| rpl_stmt_seq.inc | ||
| rpl_stmt_seq2.inc | ||
| show_binlog_events.inc | ||
| show_msg.inc | ||
| show_msg80.inc | ||
| sourced.inc | ||
| sourced1.inc | ||
| sp-vars.inc | ||
| system_db_struct.inc | ||
| test_outfile.inc | ||
| testdb_only.inc | ||
| varchar.inc | ||
| wait_slave_status.inc | ||
| wait_until_connected_again.inc | ||
| windows.inc | ||