mariadb/mysql-test/t/bug46080-master.opt at 0e7c84153d4fdf03d626ad59215912f2bf8ac030 - mirror/mariadb - May the force be without you: git.fucktheforce.de

mirror/mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00

unknown 66a1902a01 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.

2009-09-11 13:00:53 +02:00

1 line

72 B

Text

Raw Blame History

--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000