• unknown's avatar
    Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 · 7f452a07
    unknown authored
    into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
    
    
    mysql-test/lib/mtr_report.pl:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/suite/binlog/r/binlog_stm_binlog.result:
      Auto merged
    mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
      Auto merged
    mysql-test/suite/ndb/r/ndb_backup_print.result:
      Auto merged
    mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_alter_table.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_alter_table2.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_alter_table3.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_autodiscover.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_autodiscover2.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_autodiscover3.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_backup_print.test:
      Auto merged
    mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
      Auto merged
    mysql-test/suite/ndb/t/ndb_basic.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_binlog_multi.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_bitfield.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_blob.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_blob_partition.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_cache.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_cache2.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_cache_multi.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_cache_multi2.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_charset.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_config.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_config2.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_cursor.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_database.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_alter.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_basic.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_ddl.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_dump.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_gis.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_index.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_index_ordered.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_index_unique.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_insert.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_limit.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_lock.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_minmax.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_multi.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_partition_error.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_partition_key.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_partition_list.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_partition_range.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_read_multi_range.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_rename.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_replace.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_restore.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_restore_partition.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_restore_print.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_row_format.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_single_user.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_sp.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_subquery.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_temporary.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_transaction.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_trigger.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_truncate.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_types.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_update.test:
      Auto merged
    mysql-test/suite/ndb/t/ndb_view.test:
      Auto merged
    mysql-test/suite/ndb/t/ndbapi.test:
      Auto merged
    mysql-test/suite/ndb/t/ps_7ndb.test:
      Auto merged
    mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
      Auto merged
    mysql-test/suite/rpl/r/rpl_000015.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_change_master.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_deadlock_innodb.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_empty_master_crash.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_incident.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_innodb.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_loaddata.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_log_pos.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_redirect.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_replicate_do.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_rotate_logs.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_log.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_until.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_server_id1.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_server_id2.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_skip_error.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_slave_status.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_ssl.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_ssl1.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_stm_log.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_stm_until.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_udf.result:
      Auto merged
    mysql-test/suite/rpl/t/rpl_000015.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_change_master.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_commit_after_flush.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_delete_no_where.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_innodb.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_insert_ignore.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_log_pos.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_multi_update2.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_multi_update3.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_redirect.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_relayrotate.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_replicate_do.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_rotate_logs.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_001.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_UUID.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_blob_innodb.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_blob_myisam.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_charset.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_func003.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_log.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_log_innodb.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_sp003.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_row_until.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_server_id1.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_server_id2.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_skip_error.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_slave_status.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_ssl.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_ssl1.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_stm_log.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_stm_until.test:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
      Auto merged
    BitKeeper/deleted/.del-binlog_row_blackhole.test:
      Auto merged
    BitKeeper/deleted/.del-binlog_row_blackhole.result:
      Auto merged
    BitKeeper/deleted/.del-ndb_binlog_basic2.result:
      Auto merged
    BitKeeper/deleted/.del-ndb_binlog_basic2.test:
      Auto merged
    mysql-test/t/disabled.def:
      Merge
    7f452a07
rpl_ndb_extraCol.result 22.2 KB