bzr push into mysql-trunk branch (raghav.kapoor:3482 to 3483)

[Raghav Kapoor]

 3483 Raghav Kapoor	2011-10-10
      
      BUG#11765553 - 58534: MYSQL_INSTALL_DB PRINTS INCOMPLETE OPTION NAME 
      
      BACKGROUND:
      
      "--skip-grant" is an incomplete option name. It should be
      "--skip-grant-tables" in mysql_install_db.sh.Besides,full 
      option name should be displayed, not some arbitrary shorthand.
      
      
      FIX:
      
      One change has been made in file mysql_install_db.sh at 
      line 408 where "shell> $mysqld --skip-grant &" is replaced
      by "shell> $mysqld --skip-grant-tables &" to complete the 
      option name.

    modified:
      scripts/mysql_install_db.pl.in
      scripts/mysql_install_db.sh
      sql/udf_example.c
 3482 Manish Kumar	2011-10-10
      BUG#11747887:34386: MYSQLBINLOG --HEXDUMP PRINTS LAST ROW OF HEXDUMP INCORRECTLY 
      
      Problem description: when mysqlbinlog --hexdump prints events, it prints the last row of the
                           hexdump incorrectly.
                           If the last row has eight bytes,the end of the second last row is 
                           copied to the end of the last row,padding the row to full length.
                           If the last row has less than sixteen bytes, the textual 
                           representation is not aligned with the previous row.
             
      Fix: the bug was removed by padding the last line with the required 
           number of spaces in the last line.
     @ mysql-test/std_data/bug11747887-bin.000002
        Added the binlog file for the BUG#11747887.
     @ mysql-test/suite/rpl/r/binlog-hexdump.result
        Added the result file for the BUG#11747887 which has the proper alignment for the hexdump.
     @ mysql-test/suite/rpl/t/binlog-hexdump.test
        Added a test case for the BUG#11747887.
     @ sql/log_event.cc
        We appended the hexdump with the required number of spaces, to align the output
        in the required format.
        
        pad_length - gives the value of the required number of spaces to be padded.

    added:
      mysql-test/std_data/bug11747887-bin.000002
      mysql-test/suite/rpl/r/binlog-hexdump.result
      mysql-test/suite/rpl/t/binlog-hexdump.test
    modified:
      sql/log_event.cc
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2011-09-06 16:23:43 +0000
+++ b/scripts/mysql_install_db.pl.in	2011-10-10 06:59:58 +0000
@@ -538,7 +538,7 @@ else
          "",
         "Examine the logs in $opt->{ldata} for more information.",
         "You can try to start the mysqld daemon with:",
-        "$mysqld --skip-grant &",
+        "$mysqld --skip-grant-tables &",
         "and use the command line tool",
         "$bindir/mysql to connect to the mysql",
         "database and look at the grant tables:",

=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-09-06 15:59:12 +0000
+++ b/scripts/mysql_install_db.sh	2011-10-10 06:59:58 +0000
@@ -410,7 +410,7 @@ else
   echo
   echo "You can try to start the mysqld daemon with:"
   echo
-  echo "    shell> $mysqld --skip-grant &"
+  echo "    shell> $mysqld --skip-grant-tables &"
   echo
   echo "and use the command line tool $bindir/mysql"
   echo "to connect to the mysql database and look at the grant tables:"

=== modified file 'sql/udf_example.c'
--- a/sql/udf_example.c	2011-06-30 15:50:45 +0000
+++ b/sql/udf_example.c	2011-10-10 06:59:58 +0000
@@ -20,7 +20,7 @@
 ** The functions name, type and shared library is saved in the new system
 ** table 'func'.  To be able to create new functions one must have write
 ** privilege for the database 'mysql'.	If one starts MySQL with
-** --skip-grant, then UDF initialization will also be skipped.
+** --skip-grant-tables, then UDF initialization will also be skipped.
 **
 ** Syntax for the new commands are:
 ** create function <function_name> returns {string|real|integer}

No bundle (reason: useless for push emails).