bzr push into mysql-5.5 branch (nirbhay.choubey:3517 to 3518) Bug#11878394

[Nirbhay Choubey]

 3518 Nirbhay Choubey	2011-09-02
      BUG#11878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESS
                     FAILS, CAUSING CLOBBERED SOCKET
      
      A check for running mysqld instances was failing in mysqld_safe
      because of an incorrect shell command generated by cmake. The
      problem is that cmake retains the '\' of escaped double-quote,
      so the generated mysqld_safe script's command contained \" in
      the shell command, and hence the failure. 
      
      Fixed the command in scripts\CMakeLists.txt.
     @ scripts/CMakeLists.txt
        BUG#1878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESS
                      FAILS, CAUSING CLOBBERED SOCKET
        
        Removed the escaped quotes and grep for 'grep process' from
        the shell commands.

    modified:
      scripts/CMakeLists.txt
 3517 Marko M EXCEED LOG PAGE SIZE
      
      This fix was accidentally pushed to mysql-5.1 after the 5.1.59 clone-off in
      bzr revision id marko.makela@stripped-z0w992a0mrc62s6w
      with the fix of Bug#12704861 Corruption after a crash during BLOB update
      but not merged to mysql-5.5 and upwards.
      
      In the Barracuda formats, the clustered index record no longer
      contains a prefix of off-page columns. Because of this, the undo log
      must contain these prefixes, so that purge and multi-versioning will
      continue to work. However, this also means that an undo log record can
      become too big to fit in an undo log page. (It is a limitation of the
      undo log that undo records cannot span across multiple pages.)
      
      In case the checks for undo log size fail when CREATE TABLE or CREATE
      INDEX is executed, we need a fallback that blocks a modification
      operation when the undo log record would exceed the maximum size.
      
      trx_undo_free_last_page_func(): Renamed from trx_undo_free_page_in_rollback().
      Define the trx_t parameter only in debug builds.
      
      trx_undo_free_last_page(): Wrapper for trx_undo_free_last_page_func().
      Pass the trx_t parameter only in debug builds.
      
      trx_undo_truncate_end_func(): Renamed from trx_undo_truncate_end().
      Define the trx_t parameter only in debug builds. Rewrite a for(;;) loop
      as a while loop for clarity.
      
      trx_undo_truncate_end(): Wrapper for from trx_undo_truncate_end_func().
      Pass the trx_t parameter only in debug builds.
      
      trx_undo_erase_page_end(): Return TRUE if the page was non-empty
      to begin with. Refuse to erase empty pages.
      
      trx_undo_report_row_operation(): If the page for which the undo log
      was too big was empty, free the undo page and return DB_TOO_BIG_RECORD.
      
      rb:749 approved by Inaam Rana

    modified:
      include/my_base.h
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysys/my_handler_errors.h
      sql/handler.cc
      sql/share/errmsg-utf8.txt
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/db0err.h
      storage/innobase/include/trx0undo.h
      storage/innobase/row/row0mysql.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0undo.c
      storage/innobase/ut/ut0ut.c
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-11-13 22:16:52 +0000
+++ b/scripts/CMakeLists.txt	2011-09-02 11:22:04 +0000
@@ -104,11 +104,11 @@ IF(UNIX)
   # FIND_PROC and CHECK_PID are used by mysqld_safe
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SET (FIND_PROC 
-    "ps wwwp $PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" > /dev/null")
+    "ps wwwp $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null")
 ENDIF()
 IF(NOT FIND_PROC AND CMAKE_SYSTEM_NAME MATCHES "SunOS")
   SET (FIND_PROC 
-    "ps -p $PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" > /dev/null")
+    "ps -p $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null")
 ENDIF()
 
 IF(NOT FIND_PROC)
@@ -116,7 +116,7 @@ IF(NOT FIND_PROC)
   EXECUTE_PROCESS(COMMAND ps -uaxww OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result)
   IF(result MATCHES 0) 
      SET( FIND_PROC
-        "ps -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" | grep \" $PID \" > /dev/null")
+       "ps -uaxww | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
   ENDIF()
 ENDIF()
 
@@ -124,7 +124,7 @@ IF(NOT FIND_PROC)
   # SysV style
   EXECUTE_PROCESS(COMMAND ps -ef OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result)
   IF(result MATCHES 0)
-    SET( FIND_PROC "ps -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" | grep \" $PID \" > /dev/null")
+    SET( FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
   ENDIF()
 ENDIF()
   

No bundle (reason: useless for push emails).