• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 2f370575
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/extra/rpl_tests/rpl_stm_000001.test:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/mysqltest.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/rpl_loaddata.result:
      Auto merged
    mysql-test/r/rpl_loaddata_m.result:
      Auto merged
    mysql-test/r/rpl_loaddata_s.result:
      Auto merged
    mysql-test/r/rpl_misc_functions.result:
      Auto merged
    mysql-test/r/rpl_replicate_do.result:
      Auto merged
    mysql-test/r/rpl_stm_000001.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/r/trigger-compat.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/r/view_grant.result:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    mysql-test/t/mysqltest.test:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/rpl_loaddata.test:
      Auto merged
    mysql-test/t/rpl_loaddata_m.test:
      Auto merged
    mysql-test/t/rpl_loaddata_s.test:
      Auto merged
    mysql-test/t/rpl_misc_functions.test:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    mysql-test/t/symlink.test:
      Auto merged
    mysql-test/t/trigger-compat.test:
      Auto merged
    mysql-test/t/trigger-grant.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-common/client.c:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    2f370575
information_schema.test 23.8 KB