- merge changes from HEAD

Changed files:
    mysqld.conf -> 1.21.2.1

diff --git a/mysqld.conf b/mysqld.conf
index 55be1a103b3d55f29b98d846e26a0dfa935c6f1f..065b90e0e5edbd777af143f429a1a4c8a7f7a0c1 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -49,6 +49,12 @@ skip-networking
 ;master-port=3306
 ;master-password=replica
 
+; master does not ignore them, but we do
+;replicate-ignore-db=mysql
+;replicate-ignore-db=test
+
+;replicate-rewrite-db=delfi->delfi_ro
+
 ; master setup
 ;log-bin