Skip to content
  • Matthias Leich's avatar
    99c4840d
    Merge branch 'mysql-5.6' into mysql-5.7 · 99c4840d
    Matthias Leich authored
    Basically the upmerge of
       Bug#20414606 USE SINGLE QUOTES FOR PERL PATHS, IN CASE OF SPECIAL SYMBOLS
       Bug#20414565 DISABLE LARGE_TESTS.ALTER_TABLE IN DEBUG MODE
       Bug#20414569 STABILIZE TESTS THAT USE SHOW PROCESSLIST
    with resolvced conflicts in
    	mysql-test/r/sp-threads.result
    	mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
    	mysql-test/suite/funcs_1/r/processlist_priv_ps.result
    	mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
    	mysql-test/suite/funcs_1/r/processlist_val_ps.result
    	mysql-test/suite/large_tests/t/alter_table.test
    99c4840d
    Merge branch 'mysql-5.6' into mysql-5.7
    Matthias Leich authored
    Basically the upmerge of
       Bug#20414606 USE SINGLE QUOTES FOR PERL PATHS, IN CASE OF SPECIAL SYMBOLS
       Bug#20414565 DISABLE LARGE_TESTS.ALTER_TABLE IN DEBUG MODE
       Bug#20414569 STABILIZE TESTS THAT USE SHOW PROCESSLIST
    with resolvced conflicts in
    	mysql-test/r/sp-threads.result
    	mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
    	mysql-test/suite/funcs_1/r/processlist_priv_ps.result
    	mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
    	mysql-test/suite/funcs_1/r/processlist_val_ps.result
    	mysql-test/suite/large_tests/t/alter_table.test
Loading