mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
f65cb96b60
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint client/client_priv.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/rpl_deadlock_innodb.result: Auto merged mysql-test/r/rpl_flushlog_loop.result: Auto merged mysql-test/r/rpl_known_bugs_detection.result: Auto merged mysql-test/r/rpl_ndb_basic.result: Auto merged mysql-test/r/rpl_ndb_extraCol.result: Auto merged mysql-test/r/rpl_ndb_sync.result: Auto merged mysql-test/r/rpl_rbr_to_sbr.result: Auto merged mysql-test/r/rpl_row_inexist_tbl.result: Auto merged mysql-test/r/rpl_row_max_relay_size.result: Auto merged mysql-test/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/r/rpl_stm_max_relay_size.result: Auto merged mysql-test/r/rpl_stm_until.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/gis.result: Merge 5.0->5.1 mysql-test/r/rpl_000015.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_change_master.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_loaddata.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_log_pos.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_ndb_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_rotate_logs.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log_innodb.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_until.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id1.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id2.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/t/gis.test: Merge 5.0->5.1 |
||
|---|---|---|
| .. | ||
| add_anonymous_users.inc | ||
| analyze_failure_sync_with_master.test | ||
| big_test.inc | ||
| check-testcase.test | ||
| check_var_limit.inc | ||
| common-tests.inc | ||
| concurrent.inc | ||
| ctype_common.inc | ||
| ctype_filesort.inc | ||
| ctype_innodb_like.inc | ||
| ctype_like_escape.inc | ||
| deadlock.inc | ||
| delete_anonymous_users.inc | ||
| endspace.inc | ||
| federated.inc | ||
| federated_cleanup.inc | ||
| get_binlog_dump_thread_id.inc | ||
| gis_generic.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_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_example_plugin.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_ndbapi_examples.inc | ||
| have_outfile.inc | ||
| have_partition.inc | ||
| have_query_cache.inc | ||
| have_sjis.inc | ||
| have_ssl.inc | ||
| have_tis620.inc | ||
| have_ucs2.inc | ||
| have_udf.inc | ||
| have_ujis.inc | ||
| im_check_env.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 | ||
| is_debug_build.inc | ||
| loaddata_autocom.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_not_readonly.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_valgrind.inc | ||
| not_windows.inc | ||
| one_thread_per_connection.inc | ||
| parser_bug21114.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 | ||
| query_cache.inc | ||
| read_many_rows.inc | ||
| report-features.test | ||
| rowid_order.inc | ||
| rpl_events.inc | ||
| rpl_multi_engine.inc | ||
| rpl_multi_engine3.inc | ||
| rpl_stmt_seq.inc | ||
| rpl_udf.inc | ||
| safe_set_to_maybe_ro_var.inc | ||
| show_binlog_events.inc | ||
| show_msg.inc | ||
| show_msg80.inc | ||
| sp-vars.inc | ||
| strict_autoinc.inc | ||
| system_db_struct.inc | ||
| test_outfile.inc | ||
| testdb_only.inc | ||
| unsafe_binlog.inc | ||
| varchar.inc | ||
| wait_condition.inc | ||
| wait_for_query_to_suceed.inc | ||
| wait_show_pattern.inc | ||
| wait_slave_status.inc | ||
| wait_until_connected_again.inc | ||
| wait_until_rows_count.inc | ||
| windows.inc | ||