From: Marc Alff Date: March 9 2010 10:03pm Subject: bzr commit into mysql-6.0-codebase-bugfixing branch (marc.alff:3802) List-Archive: http://lists.mysql.com/commits/102790 Message-Id: <20100309220330.A91FE45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3184667073125653850==" --===============3184667073125653850== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-6.0-codebase-bugfixing/ based on revid:tor.didriksen@stripped 3802 Marc Alff 2010-03-09 [merge] Merge mysql-next-mr-bugfixing (revno 3121) --> mysql-6.0-codebase-bugfixing modified: include/mysql/psi/mysql_thread.h libmysql_r/Makefile.am === modified file 'include/mysql/psi/mysql_thread.h' --- a/include/mysql/psi/mysql_thread.h 2010-03-07 18:54:05 +0000 +++ b/include/mysql/psi/mysql_thread.h 2010-03-09 22:03:08 +0000 @@ -192,6 +192,8 @@ typedef struct st_mysql_cond mysql_cond_ on some platforms. The proper fix would be to cut these extra dependencies in the calling code. DISABLE_MYSQL_THREAD_H is a work around to limit dependencies. + DISABLE_MYSQL_PRLOCK_H is similar, and is used to disable specifically + the prlock wrappers. */ #ifndef DISABLE_MYSQL_THREAD_H @@ -748,6 +750,7 @@ static inline int inline_mysql_rwlock_in return my_rwlock_init(&that->m_rwlock, NULL); } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_init( #ifdef HAVE_PSI_INTERFACE PSI_rwlock_key key, @@ -762,6 +765,7 @@ static inline int inline_mysql_prlock_in #endif return rw_pr_init(&that->m_prlock); } +#endif static inline int inline_mysql_rwlock_destroy( mysql_rwlock_t *that) @@ -776,6 +780,7 @@ static inline int inline_mysql_rwlock_de return rwlock_destroy(&that->m_rwlock); } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_destroy( mysql_prlock_t *that) { @@ -788,6 +793,7 @@ static inline int inline_mysql_prlock_de #endif return rw_pr_destroy(&that->m_prlock); } +#endif static inline int inline_mysql_rwlock_rdlock( mysql_rwlock_t *that @@ -815,6 +821,7 @@ static inline int inline_mysql_rwlock_rd return result; } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_rdlock( mysql_prlock_t *that #ifdef HAVE_PSI_INTERFACE @@ -840,6 +847,7 @@ static inline int inline_mysql_prlock_rd #endif return result; } +#endif static inline int inline_mysql_rwlock_wrlock( mysql_rwlock_t *that @@ -867,6 +875,7 @@ static inline int inline_mysql_rwlock_wr return result; } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_wrlock( mysql_prlock_t *that #ifdef HAVE_PSI_INTERFACE @@ -892,6 +901,7 @@ static inline int inline_mysql_prlock_wr #endif return result; } +#endif static inline int inline_mysql_rwlock_tryrdlock( mysql_rwlock_t *that @@ -919,6 +929,7 @@ static inline int inline_mysql_rwlock_tr return result; } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_tryrdlock( mysql_prlock_t *that #ifdef HAVE_PSI_INTERFACE @@ -944,6 +955,7 @@ static inline int inline_mysql_prlock_tr #endif return result; } +#endif static inline int inline_mysql_rwlock_trywrlock( mysql_rwlock_t *that @@ -971,6 +983,7 @@ static inline int inline_mysql_rwlock_tr return result; } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_trywrlock( mysql_prlock_t *that #ifdef HAVE_PSI_INTERFACE @@ -996,6 +1009,7 @@ static inline int inline_mysql_prlock_tr #endif return result; } +#endif static inline int inline_mysql_rwlock_unlock( mysql_rwlock_t *that) @@ -1014,6 +1028,7 @@ static inline int inline_mysql_rwlock_un return result; } +#ifndef DISABLE_MYSQL_PRLOCK_H static inline int inline_mysql_prlock_unlock( mysql_prlock_t *that) { @@ -1030,6 +1045,7 @@ static inline int inline_mysql_prlock_un result= rw_pr_unlock(&that->m_prlock); return result; } +#endif static inline int inline_mysql_cond_init( #ifdef HAVE_PSI_INTERFACE === modified file 'libmysql_r/Makefile.am' --- a/libmysql_r/Makefile.am 2009-01-07 10:58:33 +0000 +++ b/libmysql_r/Makefile.am 2010-03-09 22:03:08 +0000 @@ -20,9 +20,11 @@ # # This file is public domain and comes with NO WARRANTY of any kind -target = libmysqlclient_r.la -target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ +target = libmysqlclient_r.la +target_defs = -DDISABLE_MYSQL_PRLOCK_H -DDONT_USE_RAID \ + -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ + +LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ AM_CPPFLAGS = -I$(top_srcdir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ --===============3184667073125653850== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 8d41931fc565c4112c4a75ebdc85196f13d46768 # timestamp: 2010-03-09 15:03:30 -0700 # source_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: tor.didriksen@stripped\ # 6pmk58mpumrc97lx # # Begin bundle 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 IEv4yHg= --===============3184667073125653850==--