From: Joerg Bruehe
Date: August 19 2011 6:00pm
Subject: bzr push into mysql-5.5 branch (joerg.bruehe:3500 to 3501) Bug#37165
List-Archive: http://lists.mysql.com/commits/140761
X-Bug: 37165
Message-Id: <201108191800.p7JI0R9x005023@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3501 Joerg Bruehe	2011-08-19 [merge]
      Null-upmerge the bug#37165 fix: No functional change,
      but some notation improvement is applicable.

    modified:
      support-files/mysql.spec.sh
 3500 Jimmy Yang	2011-08-17
      In innobase_format_name() we should call innobase_convert_name() with
      "!is_index_name" instead of "is_index_name", so the table name in the
      error message would not be formated as index name.

    modified:
      mysql-test/suite/innodb/r/innodb_corrupt_bit.result
      storage/innobase/handler/ha_innodb.cc
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-08-10 18:39:49 +0000
+++ b/support-files/mysql.spec.sh	2011-08-19 17:26:27 +0000
@@ -421,7 +421,7 @@ mkdir debug
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
-           -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
@@ -436,7 +436,7 @@ mkdir release
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-           -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
@@ -1133,6 +1133,11 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
+
 * Mon Jul 25 2011 Chuck Bell <chuck.bell@stripped>
 
 - Added the mysql_plugin client - enables or disables plugins.

No bundle (reason: useless for push emails).