• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 8f760dc0
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
    
    
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/rpl000001.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/rpl000001.test:
      Auto merged
    mysql-test/t/symlink.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
    mysql-test/mysql-test-run.pl:
      Manual merge
    mysql-test/r/mysqltest.result:
      Manual merge
    mysql-test/t/mysqltest.test:
      Manual merge
    mysql-test/t/trigger-compat.test:
      Manual merge, remove the "--text" argument, not portable
    mysql-test/t/trigger-grant.test:
      Manual merge, remove the "--text" argument, not portable
    8f760dc0
view.result 74.8 KB