bzr commit into mysql-5.1 branch (leonard:2793)

[Leonard Zhou]

#At file:///home/zhl/mysql/mysql-5.1-telco-6.3-bug29275/

 2793 Leonard Zhou	2008-12-12 [merge]
      Merge
modified:
  sql/sql_yacc.yy

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2008-12-10 15:35:47 +0000
+++ b/sql/sql_yacc.yy	2008-12-12 10:25:31 +0000
@@ -1639,8 +1639,9 @@ master_def:
            if (Lex->mi.heartbeat_period > SLAVE_MAX_HEARTBEAT_PERIOD ||
                Lex->mi.heartbeat_period < 0.0)
            {
-             char buf[sizeof(SLAVE_MAX_HEARTBEAT_PERIOD*4)];
-             my_sprintf(buf, (buf, "%d seconds", SLAVE_MAX_HEARTBEAT_PERIOD));
+             const char format[]= "%d seconds";
+             char buf[sizeof(SLAVE_MAX_HEARTBEAT_PERIOD)*4 + sizeof(format)];
+             my_sprintf(buf, (buf, format, SLAVE_MAX_HEARTBEAT_PERIOD));
              my_error(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
                       MYF(0),
                       " is negative or exceeds the maximum ",