• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c3f48766
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/mysqltest.result:
      Auto merged
    mysql-test/r/type_newdecimal.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/create_select_tmp.test:
      Auto merged
    mysql-test/t/drop.test:
      Auto merged
    mysql-test/t/flush.test:
      Auto merged
    mysql-test/t/handler.test:
      Auto merged
    mysql-test/t/innodb-deadlock.test:
      Auto merged
    mysql-test/t/innodb-lock.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/kill.test:
      Auto merged
    mysql-test/t/ndb_autodiscover2.test:
      Auto merged
    mysql-test/t/rpl000001.test:
      Auto merged
    mysql-test/t/rpl_EE_error.test:
      Auto merged
    mysql-test/t/rpl_change_master.test:
      Auto merged
    mysql-test/t/rpl_deadlock.test:
      Auto merged
    mysql-test/t/rpl_drop.test:
      Auto merged
    mysql-test/t/rpl_drop_temp.test:
      Auto merged
    mysql-test/t/rpl_error_ignored_table.test:
      Auto merged
    mysql-test/t/rpl_flush_log_loop.test:
      Auto merged
    mysql-test/t/rpl_insert_id.test:
      Auto merged
    mysql-test/t/rpl_loaddata.test:
      Auto merged
    mysql-test/t/rpl_rotate_logs.test:
      Auto merged
    mysql-test/t/rpl_sp.test:
      Auto merged
    mysql-test/t/rpl_until.test:
      Auto merged
    mysql-test/t/strict.test:
      Auto merged
    mysql-test/t/type_newdecimal.test:
      Auto merged
    client/mysqltest.c:
      Merge with --parsing-disabled
    mysql-test/t/mysqltest.test:
      Manual merge
    c3f48766
innodb-deadlock.test 2.12 KB