bzr push into mysql-5.1-bugteam branch (davi:3195 to 3196)

[Davi Arnaut]

 3196 Davi Arnaut	2009-11-05
      Introduce support for automake-1.11 silent-rules.
     @ configure.in
        Activate silent-rules if automake supports it.

    modified:
      configure.in
 3195 Dao-Gang.Qu@stripped	2009-11-05
      Bug #34739  unexpected binlog file name when --log-bin is set to a directory name
      
      If --log-bin is set to a directory name with the trailing 'FN_LIBCHAR', 
      which will be '/' on Unix like systems, and '\\' on Windows like systems. 
      the basename of the binlog is empty so that the created files named 
      '.000001' and '.index'. It is not expected. 
      The same thing happened to --log-bin-index, --relay-log and 
      --relay-log-index options.
      
      To resolve the problem, in these cases the program should report an error 
      and abort.
     @ sql/mysqld.cc
        Added a check for the value of the --log-bin and --log-bin-index arguments, 
        if it's a directory, reports an error and aborts.
     @ sql/rpl_rli.cc
        Added a check for the value of the --relay-log and --relay-log-index arguments, 
        if it's a directory, reports an error and aborts.

    modified:
      sql/mysqld.cc
      sql/rpl_rli.cc
=== modified file 'configure.in'
--- a/configure.in	2009-10-27 13:20:34 +0000
+++ b/configure.in	2009-11-05 09:48:50 +0000
@@ -13,6 +13,12 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(mysql, 5.1.41)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
+# Request support for automake silent-rules if available.
+# Default to verbose output. One can use the configure-time
+# option --enable-silent-rules or make V=1 to activate
+# silent rules.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.


Attachment: [text/bzr-bundle] bzr/[e-mail]