+2
−1
+579
−163
File changed.
Preview size limit exceeded, changes collapsed.
+1
−2
Loading
into shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools client/Makefile.am: Auto merged mysql-test/r/csv.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/sp_notembedded.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/subselect.test: Auto merged client/mysqltest.c: Manual merge mysql-test/r/mysqltest.result: Manual merge mysql-test/t/mysqltest.test: Manual merge
File changed.
Preview size limit exceeded, changes collapsed.