bzr push into mysql-5.1-bugteam branch (davi:3515 to 3516) Bug#57991

[Davi Arnaut]

 3516 Davi Arnaut	2010-12-07
      Bug#57991: Compiler flag change build error : adler32.c
      
      Do not use the same maintainer mode flags for both GCC and ICC.
      The -Wall option for ICC enables more warnings than its GCC
      counterpart.

    modified:
      config/ac-macros/maintainer.m4
 3515 Dmitry Shulga	2010-12-10
      Fixed bug#54486 - assert in my_seek, concurrent
      DROP/CREATE SCHEMA, CREATE TABLE, REPAIR.
      
      The cause of assert was concurrent execution of
      DROP DATABASE and REPAIR TABLE where first statement
      deleted table's file .TMD at the same time as
      REPAIR TABLE tried to read file details from the old file
      that was just removed.
      
      Additionally was fixed trouble when DROP TABLE try delete
      all files belong to table being dropped at the same time
      when REPAIR TABLE statement has just deleted .TMD file.
      
      No regression test added because this would require adding a
      sync point to mysys/my_redel.c. Since this bug is not present in
      5.5+, adding test coverage was considered unnecessary.
      The patch has been verified using RQG testing.
     @ sql/sql_db.cc
        mysql_rm_known_files() modified: ignore possible ENOENT error
        when trying delete all table's files. Such aggressive 
        algorithm permits skip already deleted (in another thread)
        files.
        
        Installation of Drop_table_error_handler as internal error handler
        moved from mysql_rm_db() to mysql_rm_knowns_files() near to place
        where source of possible errors (call to mysql_rm_table_part2) located.
     @ storage/myisam/mi_check.c
        mi_repair() was modified: set param->retry_repair= 0
        in order to don't call following failover procedure
        in ha_myisam::repair().

    modified:
      sql/sql_db.cc
      storage/myisam/mi_check.c
=== modified file 'config/ac-macros/maintainer.m4'
--- a/config/ac-macros/maintainer.m4	2010-11-05 13:17:47 +0000
+++ b/config/ac-macros/maintainer.m4	2010-12-07 15:06:20 +0000
@@ -15,8 +15,11 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
 
 # Set warning options required under maintainer mode.
 AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
+  # Detect ICC posing as GCC.
+  AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+               [INTEL_COMPILER=no], [INTEL_COMPILER=yes])
   # Setup GCC warning options.
-  AS_IF([test "$GCC" = "yes"], [
+  AS_IF([test "$GCC" = "yes" -a "$INTEL_COMPILER" = "no"], [
     C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
     CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
     C_WARNINGS="${C_WARNINGS} -Wdeclaration-after-statement"

No bundle (reason: useless for push emails).