After-merge fixes for merge of MySQL-5.1.38.
mysql-test/r/innodb.result: Fix wrong merge of result file conflicts. mysql-test/t/bug46080-master.opt: Fix memory limit to take into account extra storage engines in MariaDB. mysql-test/t/innodb.test: Add comment clarifying tricky --replace_result. sql/sql_select.cc: Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge. support-files/build-tags: Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.
Showing
Please register or sign in to comment