• unknown's avatar
    Fixes after merge · 1ead85e6
    unknown authored
    mysql-test/std_data/trunc_binlog.000001:
      Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
    client/mysqltest.c:
      Fixed merge problem
    mysql-test/mysql-test-run.sh:
      Fixed merge problem
    mysql-test/r/distinct.result:
      Fix after merge
    mysql-test/r/drop_temp_table.result:
      Fix after merge
    mysql-test/r/join_outer.result:
      Fix after merge
    mysql-test/r/mysqldump.result:
      Fix after merge
    mysql-test/r/null_key.result:
      Fix after merge
    mysql-test/r/order_by.result:
      Fix after merge
    mysql-test/r/rpl_alter.result:
      Fix after merge
    mysql-test/r/rpl_loaddata.result:
      Fix after merge
    mysql-test/r/rpl_loaddata_rule_m.result:
      Fix after merge
    mysql-test/r/rpl_trunc_binlog.result:
      Fix after merge
    mysql-test/r/select_safe.result:
      Fix after merge
    mysql-test/t/insert.test:
      Fix after merge
    mysql-test/t/mysqlbinlog.test:
      Fix after merge
    mysql-test/t/rpl000009.test:
      Fix after merge
    mysql-test/t/rpl_alter.test:
      Fix after merge
    mysql-test/t/rpl_loaddata_rule_m.test:
      Fix after merge
    mysql-test/t/rpl_trunc_binlog.test:
      Fix after merge
    sql-common/client.c:
      Fix after merge
    sql/item_subselect.cc:
      Fix after merge
    sql/repl_failsafe.cc:
      Fix after merge
    sql/slave.cc:
      Fix after merge
    sql/sql_insert.cc:
      Fix after merge
    1ead85e6
select_safe.result 3.1 KB